diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2a25162b9..8a79ad606 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -74,13 +74,13 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ RUN bash /tmp/library-scripts/rust-debian.sh "${CARGO_HOME}" "${RUSTUP_HOME}" "${USERNAME}" "true" "true" # Install Go -#ADD https://go.dev/dl/go1.18.4.linux-amd64.tar.gz go1.18.4.linux-amd64.tar.gz -#RUN tar -C /usr/local -xzf go1.18.4.linux-amd64.tar.gz +#ADD https://go.dev/dl/go1.21.1.linux-amd64.tar.gz go.linux-amd64.tar.gz +#RUN tar -C /usr/local -xzf go.linux-amd64.tar.gz # #RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" "$GOPATH/pkg" && chmod -R 777 "$GOPATH" #RUN chown ${USERNAME}:${USERNAME} /go -R -RUN bash /tmp/library-scripts/go-debian.sh "1.18.4" "${GOROOT}" "${GOPATH}" "${USERNAME}" "true" "true" && \ +RUN bash /tmp/library-scripts/go-debian.sh "1.21.1" "${GOROOT}" "${GOPATH}" "${USERNAME}" "true" "true" && \ go install github.com/jteeuwen/go-bindata/go-bindata@latest && go-bindata -version RUN apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 568044c58..926c9814d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -105,7 +105,7 @@ jobs: submodules: recursive - uses: actions/setup-go@v4 with: - go-version: 1.19 # The Go version to download (if necessary) and use. + go-version: 1.21 # The Go version to download (if necessary) and use. - name: Install Intel's SGX SDK run: | mkdir -p "$HOME/.sgxsdk" @@ -236,7 +236,7 @@ jobs: submodules: recursive - uses: actions/setup-go@v4 with: - go-version: 1.19 # The Go version to download (if necessary) and use. + go-version: 1.21 # The Go version to download (if necessary) and use. - name: Install xgo run: | go install github.com/crazy-max/xgo@v0.17.0 diff --git a/.github/workflows/go-lint.yml b/.github/workflows/go-lint.yml index 85c834e56..071a53527 100644 --- a/.github/workflows/go-lint.yml +++ b/.github/workflows/go-lint.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - uses: actions/checkout@v4 - name: make bin-data-sw run: | diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8f14d1eed..b83122e0b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -151,7 +151,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: - go-version: 1.19 # The Go version to download (if necessary) and use. + go-version: 1.21 # The Go version to download (if necessary) and use. - name: Build CLI shell: bash run: | @@ -168,7 +168,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: - go-version: 1.19 # The Go version to download (if necessary) and use. + go-version: 1.21 # The Go version to download (if necessary) and use. - name: Install xgo run: | go install github.com/crazy-max/xgo@v0.17.0 diff --git a/deployment/dockerfiles/Dockerfile b/deployment/dockerfiles/Dockerfile index 6f88c0d5b..221a4d921 100644 --- a/deployment/dockerfiles/Dockerfile +++ b/deployment/dockerfiles/Dockerfile @@ -90,7 +90,7 @@ ENV GOROOT=/usr/local/go ENV GOPATH=/go/ ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin -ADD https://go.dev/dl/go1.19.linux-amd64.tar.gz go.linux-amd64.tar.gz +ADD https://go.dev/dl/go1.21.1.linux-amd64.tar.gz go.linux-amd64.tar.gz RUN tar -C /usr/local -xzf go.linux-amd64.tar.gz RUN go install github.com/jteeuwen/go-bindata/go-bindata@latest && go-bindata -version diff --git a/deployment/dockerfiles/tests/compile-contracts.Dockerfile b/deployment/dockerfiles/tests/compile-contracts.Dockerfile index a60495149..55e105bd8 100644 --- a/deployment/dockerfiles/tests/compile-contracts.Dockerfile +++ b/deployment/dockerfiles/tests/compile-contracts.Dockerfile @@ -15,7 +15,7 @@ ENV GOROOT=/usr/local/go ENV GOPATH=/go/ ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin -ADD https://go.dev/dl/go1.19.linux-amd64.tar.gz go.linux-amd64.tar.gz +ADD https://go.dev/dl/go1.21.1.linux-amd64.tar.gz go.linux-amd64.tar.gz RUN tar -C /usr/local -xzf go.linux-amd64.tar.gz RUN apt-get update -y && \ diff --git a/go.mod b/go.mod index dd35a15a2..0181e2648 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/scrtlabs/SecretNetwork -go 1.20 +go 1.21 replace ( github.com/cometbft/cometbft => github.com/scrtlabs/tendermint v1.9.0-scrt.0.20230802144651-d62916253d52 diff --git a/scripts/install-everything.sh b/scripts/install-everything.sh index 10bed81b4..cba3ef394 100644 --- a/scripts/install-everything.sh +++ b/scripts/install-everything.sh @@ -20,7 +20,7 @@ rustup component add rust-src rustup target add wasm32-unknown-unknown # Install Go -GO_VERSION=1.20.2 +GO_VERSION=1.21.1 wget -q https://golang.org/dl/go$GO_VERSION.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go$GO_VERSION.linux-amd64.tar.gz export PATH=$PATH:/usr/local/go/bin