3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-04-29 18:36:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix travis matrix conflict (#466)

Browse source
This commit is contained in:
Travis Groth 2020-01-22 00:09:14 -05:00 • committed by Bobby DeSimone
parent 1db1a75a8b
commit 34e35b7168
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -59,11 +59,12 @@ docker_setup: &docker_setup
docker_login: &docker_login docker_login: &docker_login
- echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin - echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin
jobs: matrix:
include: include:
- name: "Test Build amd64" - name: "Test Build amd64"
stage: "Docker Test Build" stage: "Docker Test Build"
install: *docker_setup install: *docker_setup
go: 1.x
script: script:
- .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT} Dockerfile - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT} Dockerfile
@ -72,6 +73,7 @@ jobs:
if: branch = master if: branch = master
install: *docker_setup install: *docker_setup
before_script: *docker_login before_script: *docker_login
go: 1.x
script: script:
- .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:master Dockerfile - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:master Dockerfile
- docker push ${TRAVIS_REPO_SLUG} - docker push ${TRAVIS_REPO_SLUG}
@ -80,6 +82,7 @@ jobs:
if: branch = master if: branch = master
install: *docker_setup install: *docker_setup
before_script: *docker_login before_script: *docker_login
go: 1.x
script: script:
- .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm64v8-master Dockerfile.arm64v8 - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm64v8-master Dockerfile.arm64v8
- docker push ${TRAVIS_REPO_SLUG} - docker push ${TRAVIS_REPO_SLUG}
@ -88,6 +91,7 @@ jobs:
if: tag =~ /^v([0-9.]+)$/ if: tag =~ /^v([0-9.]+)$/
install: *docker_setup install: *docker_setup
before_script: *docker_login before_script: *docker_login
go: 1.x
script: script:
- .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:${TRAVIS_TAG} Dockerfile - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:${TRAVIS_TAG} Dockerfile
- docker tag ${TRAVIS_REPO_SLUG}:${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:latest - docker tag ${TRAVIS_REPO_SLUG}:${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:latest
@ -99,6 +103,7 @@ jobs:
if: tag =~ /^v([0-9.]+)$/ if: tag =~ /^v([0-9.]+)$/
install: *docker_setup install: *docker_setup
before_script: *docker_login before_script: *docker_login
go: 1.x
script: script:
- .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm64v8-${TRAVIS_TAG} Dockerfile.arm64v8 - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm64v8-${TRAVIS_TAG} Dockerfile.arm64v8
- docker tag ${TRAVIS_REPO_SLUG}:arm64v8-${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:arm64v8-latest - docker tag ${TRAVIS_REPO_SLUG}:arm64v8-${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:arm64v8-latest
@ -108,6 +113,7 @@ jobs:
if: tag =~ /^v([0-9.]+)$/ if: tag =~ /^v([0-9.]+)$/
install: *docker_setup install: *docker_setup
before_script: *docker_login before_script: *docker_login
go: 1.x
script: script:
- .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm32v7-${TRAVIS_TAG} Dockerfile.arm32v7 - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm32v7-${TRAVIS_TAG} Dockerfile.arm32v7
- docker tag ${TRAVIS_REPO_SLUG}:arm32v7-${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:arm32v7-latest - docker tag ${TRAVIS_REPO_SLUG}:arm32v7-${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:arm32v7-latest
@ -117,6 +123,7 @@ jobs:
if: tag =~ /^v([0-9.]+)$/ if: tag =~ /^v([0-9.]+)$/
install: *docker_setup install: *docker_setup
before_script: *docker_login before_script: *docker_login
go: 1.x
script: script:
- .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm32v6-${TRAVIS_TAG} Dockerfile.arm32v6 - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm32v6-${TRAVIS_TAG} Dockerfile.arm32v6
- docker tag ${TRAVIS_REPO_SLUG}:arm32v6-${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:arm32v6-latest - docker tag ${TRAVIS_REPO_SLUG}:arm32v6-${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:arm32v6-latest