build: bump up golang ver to 1.21

b-harvest · Nov 29, 2023 · 71c8a78 · 71c8a78
1 parent 77d8f0f
commit 71c8a78
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
           check-latest: true
       - uses: technote-space/[email protected]
         id: git_diff

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
           check-latest: true
       - name: "Checkout Repository"
         uses: actions/checkout@v3

diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
           check-latest: true
       - name: release dry run
         run: make release-dry-run

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
       # Required: setup-go, for all versions v3.0.0+ of golangci-lint
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -47,7 +47,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
@@ -68,7 +68,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: 1.21
           check-latest: true
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]

diff --git a/.golangci.yml b/.golangci.yml
@@ -62,13 +62,13 @@ linters-settings:
     require-explanation: false
     require-specific: false
   gofumpt:
-    lang-version: "1.19"
+    lang-version: "1.21"
   gomodguard:
     blocked:
-      versions: # List of blocked module version constraints
-        - https://github.com/etcd-io/etcd: # Blocked module with version constraint
-            version: ">= 3.4.10 || ~3.3.23" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
-            reason: "CVE-2020-15114; CVE-2020-15136; CVE-2020-15115" # Reason why the version constraint exists. (Optional)
-        - https://github.com/dgrijalva/jwt-go: # Blocked module with version constraint
-            version: ">= 4.0.0-preview1" # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
-            reason: "CVE-2020-26160" # Reason why the version constraint exists. (Optional)
+      versions:  # List of blocked module version constraints
+        - https://github.com/etcd-io/etcd:  # Blocked module with version constraint
+            version: ">= 3.4.10 || ~3.3.23"  # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
+            reason: "CVE-2020-15114; CVE-2020-15136; CVE-2020-15115"  # Reason why the version constraint exists. (Optional)
+        - https://github.com/dgrijalva/jwt-go:  # Blocked module with version constraint
+            version: ">= 4.0.0-preview1"  # Version constraint, see https://github.com/Masterminds/semver#basic-comparisons
+            reason: "CVE-2020-26160"  # Reason why the version constraint exists. (Optional)
diff --git a/Makefile b/Makefile
@@ -176,7 +176,7 @@ build-all: tools build lint test vulncheck
 ###############################################################################
 
 PACKAGE_NAME:=github.com/evmos/ethermint
-GOLANG_CROSS_VERSION = v1.19
+GOLANG_CROSS_VERSION = v1.21
 GOPATH ?= '$(HOME)/go'
 release-dry-run:
 	docker run \

diff --git a/networks/local/ethermintnode/Dockerfile b/networks/local/ethermintnode/Dockerfile
@@ -15,7 +15,7 @@ COPY . .
 RUN make build-linux
 
 # Final image
-FROM golang:1.19 as final
+FROM golang:1.21 as final
 
 WORKDIR /