Skip to content

Commit

Permalink
Bump Go from 1.20 to 1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
tkxkd0159 committed Jun 25, 2024
1 parent a348dc5 commit 5149cf2
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/setup-go@v3.5.0
with:
go-version: '1.20'
go-version: '1.22'
- uses: actions/checkout@v3
- uses: technote-space/get-diff-action@v6.1.2
id: git_diff
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.5.0
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- name: Check if difference
Expand Down Expand Up @@ -50,9 +50,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.5.0
- uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- name: Check if difference
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.5.0
with:
go-version: '1.20'
go-version: '1.22'
- name: Display go version
run: go version
- name: Check if difference
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# docker build . -t finschia/wasmd:latest
# docker run --rm -it finschia/wasmd:latest /bin/sh
FROM golang:1.20-alpine AS go-builder
FROM golang:1.22-alpine AS go-builder
ARG arch=x86_64

# this comes from standard alpine nightly file
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN echo "Ensuring binary is statically linked ..." \
&& (file /code/build/wasmd | grep "statically linked")

# --------------------------------------------------------
FROM alpine:3.15
FROM alpine:3.18

COPY --from=go-builder /code/build/wasmd /usr/bin/wasmd

Expand Down
4 changes: 2 additions & 2 deletions contrib/prototools-docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.8-alpine3.13 AS build
FROM golang:1.22-alpine3.18 AS build

#ARG PROTOTOOL_VERSION=1.10.0
ARG PROTODOC_VERSION=1.3.2
Expand Down Expand Up @@ -39,7 +39,7 @@ RUN GO111MODULE=on go get \

RUN upx --lzma /usr/local/bin/*

FROM golang:1.20-alpine
FROM golang:1.22-alpine3.18
ENV LD_LIBRARY_PATH=/lib64:/lib

WORKDIR /work
Expand Down
8 changes: 2 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/Finschia/wasmd

go 1.20
go 1.22

require (
github.com/Finschia/finschia-sdk v0.48.0
Expand Down Expand Up @@ -68,7 +68,7 @@ require (
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/gogo/gateway v1.1.0 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/orderedcode v0.0.1 // indirect
Expand Down Expand Up @@ -141,11 +141,7 @@ require (
replace (
github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
github.com/cosmos/ibc-go/v4 => github.com/Finschia/ibc-go/v4 v4.3.1
// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0
// latest grpc doesn't work with with our modified proto compiler, so we need to enforce
// the following version across all dependencies.
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
google.golang.org/grpc => google.golang.org/grpc v1.33.2
)
Loading

0 comments on commit 5149cf2

Please sign in to comment.