upgrade from go 1.19 to go 1.21 everywhere

cosmology-tech · Oct 26, 2023 · 623d8e1 · 623d8e1
1 parent 791d683
commit 623d8e1
Show file tree

Hide file tree

Showing 26 changed files with 35 additions and 34 deletions.
diff --git a/.github/actions/e2e-test/action.yaml b/.github/actions/e2e-test/action.yaml
@@ -60,12 +60,12 @@ runs:
 
     - uses: actions/setup-go@v4
       with:
-        go-version: "1.19"
+        go-version: "1.21"
         check-latest: true
 
     - name: Setup Test infra
       id: starship-action
-      uses: cosmology-tech/starship-action@3212f0489677d5c7e7b3ee8cd461faf63785b35d
+      uses: cosmology-tech/starship-action@40850df7d3346bdeafc4bb95c0778bbef191e030
       with:
         values: ${{ env.CONFIG_FILE }}
         port-forward: true

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -24,7 +24,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
+          go-version: "1.21"
           check-latest: true
 
       - name: Build exposer
@@ -41,7 +41,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
+          go-version: "1.21"
           check-latest: true
 
       - name: Build registry
@@ -58,7 +58,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
+          go-version: "1.21"
           check-latest: true
 
       - name: Build faucet

diff --git a/.github/workflows/pr-tests.yaml b/.github/workflows/pr-tests.yaml
@@ -39,12 +39,12 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
+          go-version: "1.21"
           check-latest: true
 
       - name: Setup Test infra
         id: starship-action
-        uses: cosmology-tech/starship-action@3212f0489677d5c7e7b3ee8cd461faf63785b35d
+        uses: cosmology-tech/starship-action@40850df7d3346bdeafc4bb95c0778bbef191e030
         with:
           values: ${{ env.CONFIG_FILE }}
           port-forward: true

diff --git a/.github/workflows/smoke-tests.yaml b/.github/workflows/smoke-tests.yaml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Setup Test infra
         id: starship-action
-        uses: cosmology-tech/starship-action@3212f0489677d5c7e7b3ee8cd461faf63785b35d
+        uses: cosmology-tech/starship-action@40850df7d3346bdeafc4bb95c0778bbef191e030
         with:
           values: ${{ env.CONFIG_FILE }}
           port-forward: true
@@ -67,7 +67,7 @@ jobs:
 
       - name: Setup Test infra
         id: starship-action
-        uses: cosmology-tech/starship-action@3212f0489677d5c7e7b3ee8cd461faf63785b35d
+        uses: cosmology-tech/starship-action@40850df7d3346bdeafc4bb95c0778bbef191e030
         with:
           values: ${{ env.CONFIG_FILE }}
           port-forward: true
@@ -105,7 +105,7 @@ jobs:
 
       - name: Setup Test infra
         id: starship-action
-        uses: cosmology-tech/starship-action@3212f0489677d5c7e7b3ee8cd461faf63785b35d
+        uses: cosmology-tech/starship-action@40850df7d3346bdeafc4bb95c0778bbef191e030
         with:
           values: ${{ env.CONFIG_FILE }}
           port-forward: true

diff --git a/clients/go/client/go.mod b/clients/go/client/go.mod
@@ -1,6 +1,6 @@
 module github.com/cosmology-tech/starship/clients/go/client
 
-go 1.19
+go 1.21
 
 replace (
 	github.com/cosmology-tech/starship/registry => ../../../registry

diff --git a/cmd/starship/go.mod b/cmd/starship/go.mod
@@ -1,11 +1,12 @@
 module github.com/cosmology-tech/starship/cmd/starship
 
-go 1.19
+go 1.21
 
 require (
 	github.com/gofrs/flock v0.8.1
 	github.com/urfave/cli/v2 v2.25.3
 	go.uber.org/zap v1.24.0
+	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.12.0
 	sigs.k8s.io/yaml v1.3.0
 )
@@ -129,7 +130,6 @@ require (
 	google.golang.org/protobuf v1.29.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.27.1 // indirect
 	k8s.io/apiextensions-apiserver v0.27.1 // indirect
 	k8s.io/apimachinery v0.27.1 // indirect

diff --git a/docker/chains/Dockerfile b/docker/chains/Dockerfile
@@ -2,7 +2,7 @@ ARG BASE_IMAGE
 ARG VERSION
 FROM ${BASE_IMAGE}:${VERSION} AS source
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/docker/chains/Dockerfile.injective b/docker/chains/Dockerfile.injective
@@ -2,7 +2,7 @@ ARG BASE_IMAGE
 ARG VERSION
 FROM ${BASE_IMAGE}:${VERSION} AS source
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/docker/chains/Dockerfile.union b/docker/chains/Dockerfile.union
@@ -2,7 +2,7 @@ ARG BASE_IMAGE
 ARG VERSION
 FROM ${BASE_IMAGE}:${VERSION} AS source
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/docker/faucet/cosmjs-faucet/Dockerfile b/docker/faucet/cosmjs-faucet/Dockerfile
@@ -24,7 +24,7 @@ RUN (cd packages/faucet && SKIP_BUILD=1 yarn pack-node)
 
 # Use Alpine and install Node.js which is 50% smaller than the -alpine version of the node
 # image (53 MB including the faucet app).
-FROM alpine:3.16
+FROM alpine:3.17
 
 # Set up dependencies, nodejs is special case
 ENV PACKAGES curl make bash jq sed nodejs

diff --git a/docker/relayers/go-relayer/Dockerfile b/docker/relayers/go-relayer/Dockerfile
@@ -2,7 +2,7 @@ ARG BASE_IMAGE
 ARG VERSION
 FROM ${BASE_IMAGE}:${VERSION} as base
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/docker/starship/base/Dockerfile b/docker/starship/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/docker/starship/base/Dockerfile.arm64 b/docker/starship/base/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.16
+FROM arm64v8/alpine:3.17
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/docker/starship/builder/Dockerfile b/docker/starship/builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine3.16
+FROM golang:1.21-alpine3.17
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/docker/starship/runner/Dockerfile b/docker/starship/runner/Dockerfile
@@ -2,7 +2,7 @@ FROM golang:1.18-alpine3.16 AS go-builder
 
 RUN go install github.com/cosmos/cosmos-sdk/cosmovisor/cmd/[email protected]
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/examples/upgrade-test/go.mod b/examples/upgrade-test/go.mod
@@ -1,6 +1,6 @@
 module upgrade_test
 
-go 1.19
+go 1.21
 
 replace github.com/strangelove-ventures/lens => github.com/Anmol1696/lens v0.1.1-0.20230331154219-5027f163133a
 

diff --git a/exposer/Dockerfile b/exposer/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine3.16 AS builder
+FROM golang:1.21-alpine3.17 AS builder
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/exposer/go.mod b/exposer/go.mod
@@ -1,6 +1,6 @@
 module github.com/cosmology-tech/starship/exposer
 
-go 1.19
+go 1.21
 
 require (
 	github.com/go-chi/chi v1.5.4

diff --git a/exposer/go.sum b/exposer/go.sum
@@ -39,6 +39,7 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 h1:gDLXvp5S9izjldquuoAhDzccbskOL6tDC5jMSyx3zxE=

diff --git a/faucet/Dockerfile b/faucet/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine3.16 AS builder
+FROM golang:1.21-alpine3.17 AS builder
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/faucet/go.mod b/faucet/go.mod
@@ -1,10 +1,9 @@
 module github.com/cosmology-tech/starship/faucet
 
-go 1.19
+go 1.21
 
 require (
 	github.com/go-chi/chi v1.5.4
-	github.com/golang/protobuf v1.5.3
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2
 	github.com/urfave/cli v1.22.12
@@ -18,6 +17,7 @@ require (
 	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/golang/glog v1.1.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/stretchr/testify v1.8.2 // indirect

diff --git a/go.work b/go.work
@@ -1,13 +1,13 @@
-go 1.19
+go 1.21
 
 use (
 	./clients/go/client
 	./cmd/starship
 
 	./examples/upgrade-test
 	./exposer
-	./registry
 	./faucet
+	./registry
 	./tests/e2e
 	./tools
 )
diff --git a/registry/Dockerfile b/registry/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine3.16 AS builder
+FROM golang:1.21-alpine3.17 AS builder
 
 LABEL org.opencontainers.image.source="https://github.com/cosmology-tech/starship"
 

diff --git a/registry/go.mod b/registry/go.mod
@@ -1,6 +1,6 @@
 module github.com/cosmology-tech/starship/registry
 
-go 1.19
+go 1.21
 
 require (
 	github.com/cosmos/ibc-go/v7 v7.0.0-rc0

diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod
@@ -1,6 +1,6 @@
 module github.com/cosmology-tech/starship/tests/e2e
 
-go 1.19
+go 1.21
 
 require (
 	github.com/cosmology-tech/starship/exposer v0.0.0-20230413092908-7da9e8a24b31

diff --git a/tools/go.mod b/tools/go.mod
@@ -1,6 +1,6 @@
 module tools
 
-go 1.19
+go 1.21
 
 require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2