From b5363f8c522d3509c8a64116cd6af66e61faac34 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar <43061995+xenowits@users.noreply.github.com> Date: Thu, 9 Nov 2023 15:12:33 +0530 Subject: [PATCH] *: bump to go 1.21.4 (#2694) Bump go version to `1.21.4`. This resolves failing govulncheck in https://github.com/ObolNetwork/charon/actions/runs/6809276170/job/18515227544?pr=2693. category: fixbuild ticket: none --- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/govulncheck.yml | 2 +- .github/workflows/nightly-tests.yml | 2 +- .github/workflows/pre-commit.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 8 ++++---- .github/workflows/verify-pr.yml | 2 +- .golangci.yml | 4 ++-- Dockerfile | 2 +- testutil/promrated/Dockerfile | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index ef3d3bffd..e5d2fedda 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -16,7 +16,7 @@ jobs: # Config options can be found in README here: https://github.com/golangci/golangci-lint-action - uses: actions/setup-go@v4 with: - go-version: '1.21.3' + go-version: '1.21.4' - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index 538c436bc..62a3ca54e 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -14,6 +14,6 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: '1.21.3' + go-version: '1.21.4' - run: go install golang.org/x/vuln/cmd/govulncheck@latest - run: govulncheck -show=stacks -test ./... diff --git a/.github/workflows/nightly-tests.yml b/.github/workflows/nightly-tests.yml index f579f1b65..6dc3a1968 100644 --- a/.github/workflows/nightly-tests.yml +++ b/.github/workflows/nightly-tests.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: '1.21.3' + go-version: '1.21.4' - uses: actions/cache@v3 with: path: | diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 29ddb16aa..5d668e670 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v2 - uses: actions/setup-go@v4 with: - go-version: '1.21.3' + go-version: '1.21.4' - uses: pre-commit/action@v2.0.3 - name: notify failure diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2625013fc..3ade57421 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: fetch-depth: 0 # Disable shallow checkout - uses: actions/setup-go@v4 with: - go-version: '1.21.3' + go-version: '1.21.4' - run: go run . --help > cli-reference.txt - run: go run testutil/genchangelog/main.go - uses: softprops/action-gh-release@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 807fcb602..9dfe5191e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: '1.21.3' + go-version: '1.21.4' - uses: actions/cache@v3 with: path: | @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: '1.21.3' + go-version: '1.21.4' - uses: actions/cache@v3 with: path: | @@ -51,7 +51,7 @@ jobs: - uses: docker/setup-buildx-action@v2 # For compose to build images - uses: actions/setup-go@v4 with: - go-version: '1.21.3' + go-version: '1.21.4' - uses: actions/cache@v3 with: path: | @@ -78,7 +78,7 @@ jobs: - uses: docker/setup-buildx-action@v2 # For compose to build images - uses: actions/setup-go@v4 with: - go-version: '1.21.3' + go-version: '1.21.4' - uses: actions/cache@v3 with: path: | diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml index d1a317541..bf5d1c775 100644 --- a/.github/workflows/verify-pr.yml +++ b/.github/workflows/verify-pr.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: '1.21.3' + go-version: '1.21.4' - name: "Verify PR" run: go run github.com/obolnetwork/charon/testutil/verifypr diff --git a/.golangci.yml b/.golangci.yml index 0829aabc7..579ab883c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ run: timeout: 5m - go: "1.21.3" + go: "1.21.4" linters-settings: cyclop: max-complexity: 15 @@ -99,7 +99,7 @@ linters-settings: - "github.com/gogo/protobuf/proto" # Prefer google.golang.org/protobuf - "github.com/prometheus/client_golang/prometheus/promauto" # Prefer ./app/promauto staticcheck: - go: "1.21.3" + go: "1.21.4" checks: - "all" - "-SA1019" # Ignoring since github.com/drand/kyber/sign/bls uses Proof Of Possession as does Ethereum. diff --git a/Dockerfile b/Dockerfile index 80e7c5f69..b9f3a6b84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Container for building Go binary. -FROM golang:1.21.3-bullseye AS builder +FROM golang:1.21.4-bullseye AS builder # Install dependencies RUN apt-get update && apt-get install -y build-essential git # Prep and copy source diff --git a/testutil/promrated/Dockerfile b/testutil/promrated/Dockerfile index de1b49ee2..60fe44f05 100644 --- a/testutil/promrated/Dockerfile +++ b/testutil/promrated/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.3-alpine AS builder +FROM golang:1.21.4-alpine AS builder # Install dependencies RUN apk add --no-cache build-base git