From fb9f84e2a94e14f9cbfc230e592bb8a07c6beff4 Mon Sep 17 00:00:00 2001 From: Kaloyan Tanev Date: Wed, 4 Sep 2024 02:08:07 +0300 Subject: [PATCH 1/2] Bump go version to 1.23 --- .github/actions/setup-go/action.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .golangci.yml | 2 +- .pre-commit-config.yaml | 2 +- Dockerfile | 2 +- go.mod | 2 +- testutil/promrated/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup-go/action.yml b/.github/actions/setup-go/action.yml index d36e379a9..42be8d1fd 100644 --- a/.github/actions/setup-go/action.yml +++ b/.github/actions/setup-go/action.yml @@ -6,4 +6,4 @@ runs: - name: Setup go uses: actions/setup-go@v4 with: - go-version: '1.22.5' + go-version: '1.23.0' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9c6ba92dc..a05d7464c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -21,7 +21,7 @@ on: - cron: '18 19 * * 6' env: - GOLANG_VERSION: '1.22' + GOLANG_VERSION: '1.23' jobs: analyze: diff --git a/.golangci.yml b/.golangci.yml index 4ab7b147c..595750035 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ run: timeout: 5m - go: "1.22.5" + go: "1.23.0" linters-settings: cyclop: max-complexity: 15 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 82f26597f..beb5019b9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: rev: v0.0.3 hooks: - id: check-go-version - args: [ -v=go1.22 ] # Only check minor version locally + args: [ -v=go1.23 ] # Only check minor version locally pass_filenames: false additional_dependencies: [ packaging ] - id: check-licence-header diff --git a/Dockerfile b/Dockerfile index f9ab8a8be..a5a49ddcd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Container for building Go binary. -FROM golang:1.22.5-bookworm AS builder +FROM golang:1.23.0-bookworm AS builder # Install dependencies RUN apt-get update && apt-get install -y build-essential git # Prep and copy source diff --git a/go.mod b/go.mod index 2ff4e3328..f2806215a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/obolnetwork/charon -go 1.22 +go 1.23 require ( github.com/attestantio/go-eth2-client v0.21.10 diff --git a/testutil/promrated/Dockerfile b/testutil/promrated/Dockerfile index d75382daf..a757b24ee 100644 --- a/testutil/promrated/Dockerfile +++ b/testutil/promrated/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.5-alpine AS builder +FROM golang:1.23.0-alpine AS builder # Install dependencies RUN apk add --no-cache build-base git From c4a745a070c2fdd8dadea1ba2d7904dc42e6a69b Mon Sep 17 00:00:00 2001 From: Kaloyan Tanev Date: Wed, 4 Sep 2024 11:51:39 +0300 Subject: [PATCH 2/2] Increase peers tests timeout --- cmd/testpeers_internal_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/testpeers_internal_test.go b/cmd/testpeers_internal_test.go index bab70afc0..34051717d 100644 --- a/cmd/testpeers_internal_test.go +++ b/cmd/testpeers_internal_test.go @@ -224,7 +224,7 @@ func TestPeersTest(t *testing.T) { testConfig: testConfig{ OutputToml: "./write-to-file-test.toml.tmp", Quiet: false, - Timeout: 100 * time.Millisecond, + Timeout: 500 * time.Millisecond, }, ENRs: []string{ "enr:-HW4QBHlcyD3fYWUMADiOv4OxODaL5wJG0a7P7d_ltu4VZe1MibZ1N-twFaoaq0BoCtXcY71etxLJGeEZT5p3XCO6GOAgmlkgnY0iXNlY3AyNTZrMaEDI2HRUlVBag__njkOWEEQRLlC9ylIVCrIXOuNBSlrx6o",