diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3098ef2f6..ec56df45d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.17.2" + go-version: "1.17.5" - env: TARGET: ${{ matrix.target }} run: | diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 2af1bbedc..ab7b1a51a 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.17.2" + go-version: "1.17.5" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/functional.yaml b/.github/workflows/functional.yaml index 28adf47e4..5fbce8ac1 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.17.2" + go-version: "1.17.5" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/grpcproxy.yaml b/.github/workflows/grpcproxy.yaml index 0559c123a..f4850a2da 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.17.2" + go-version: "1.17.5" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 820f6114a..5bba003c5 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.17.2" + go-version: "1.17.5" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index f30e6e244..59a40253f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.17.2" + go-version: "1.17.5" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.travis.yml b/.travis.yml index d80bc2867..b0a2bcffc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ sudo: required services: docker go: - - "1.17.2" + - "1.17.5" - tip notifications: @@ -21,14 +21,14 @@ env: matrix: fast_finish: true allow_failures: - - go: "1.17.2" + - go: "1.17.5" 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.17.2" + - go: "1.17.5" env: TARGET=linux-amd64-fmt-unit-go-tip-2-cpu before_install: diff --git a/Makefile b/Makefile index 9c7c1a1ae..c293f7df8 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ clean: rm -rf ./tests/e2e/default.proxy find ./ -name "127.0.0.1:*" -o -name "localhost:*" -o -name "*.log" -o -name "agent-*" -o -name "*.coverprofile" -o -name "testname-proxy-*" | $(XARGS) -GO_VERSION ?= 1.17.2 +GO_VERSION ?= 1.17.5 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) diff --git a/tests/functional/Dockerfile b/tests/functional/Dockerfile index 38c834bc7..52566b0f0 100644 --- a/tests/functional/Dockerfile +++ b/tests/functional/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:28 +FROM fedora:35 RUN dnf check-update || true \ && dnf install --assumeyes \ @@ -13,7 +13,7 @@ RUN dnf check-update || true \ ENV GOROOT /usr/local/go ENV GOPATH /go ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH} -ENV GO_VERSION 1.14.3 +ENV GO_VERSION 1.17.5 ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang RUN rm -rf ${GOROOT} \ && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \