From 1801ef8d71590eeb5273efd7532e8f794cc8f1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Tue, 22 Mar 2022 00:00:22 +0100 Subject: [PATCH 1/2] Update to go 1.16.15 --- .github/workflows/e2e.yaml | 2 +- .github/workflows/functional.yaml | 2 +- .github/workflows/grpcproxy.yaml | 2 +- .github/workflows/tests.yaml | 2 +- .travis.yml | 6 +++--- Makefile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index a39e00d7c..785500915 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.16.3" + go-version: "1.16.15" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/functional.yaml b/.github/workflows/functional.yaml index 75842485e..3c488a97f 100644 --- a/.github/workflows/functional.yaml +++ b/.github/workflows/functional.yaml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.16.3" + go-version: "1.16.15" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/grpcproxy.yaml b/.github/workflows/grpcproxy.yaml index c2b90fdc4..9d966067b 100644 --- a/.github/workflows/grpcproxy.yaml +++ b/.github/workflows/grpcproxy.yaml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.16.3" + go-version: "1.16.15" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index eb7ba4cf4..8f337987a 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.16.3" + go-version: "1.16.15" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.travis.yml b/.travis.yml index 6cf103e80..bf90edbde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required services: docker go: - - "1.16.3" + - "1.16.15" - tip notifications: @@ -21,14 +21,14 @@ env: matrix: fast_finish: true allow_failures: - - go: "1.16.3" + - go: "1.16.15" env: TARGET=linux-amd64-coverage - go: tip env: TARGET=linux-amd64-fmt-unit-go-tip-2-cpu exclude: - go: tip env: TARGET=linux-amd64-coverage - - go: "1.16.3" + - go: "1.16.15" env: TARGET=linux-amd64-fmt-unit-go-tip-2-cpu before_install: diff --git a/Makefile b/Makefile index bfd6741c6..3cdd2168e 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ docker-remove: -GO_VERSION ?= 1.16.3 +GO_VERSION ?= 1.16.15 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) From c51c8d24e146a9c597fe964abab45cd7dd3d5dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 17 Dec 2021 23:02:26 +0100 Subject: [PATCH 2/2] Build locally if docker-test container image does not exist This should make it easier to bump the golang version --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3cdd2168e..b947c0f85 100644 --- a/Makefile +++ b/Makefile @@ -161,7 +161,10 @@ test-full: $(info log-file: test-$(TEST_SUFFIX).log) PASSES="fmt build release unit integration functional e2e grpcproxy" ./test.sh 2<&1 | tee test-$(TEST_SUFFIX).log -docker-test: +ensure-docker-test-image-exists: + make push-docker-test || echo "WARNING: Container Image not found in registry, building locally"; make build-docker-test + +docker-test: ensure-docker-test-image-exists $(info GO_VERSION: $(GO_VERSION)) $(info ETCD_VERSION: $(ETCD_VERSION)) $(info TEST_OPTS: $(TEST_OPTS))