From b5965572b09d3b70dd264150f5837198c0f62d0e Mon Sep 17 00:00:00 2001 From: emidev98 Date: Fri, 8 Dec 2023 08:44:17 +0200 Subject: [PATCH 1/2] feat(v2.9): upgrade golang 1.21.5 --- .github/workflows/interchaine2e.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 4 ++-- Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- integration-tests/README.md | 2 +- interchaintest/go.mod | 2 +- shared.Dockerfile | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/interchaine2e.yml b/.github/workflows/interchaine2e.yml index 071c745f..365827ec 100644 --- a/.github/workflows/interchaine2e.yml +++ b/.github/workflows/interchaine2e.yml @@ -12,7 +12,7 @@ permissions: packages: write env: - GO_VERSION: 1.20.7 + GO_VERSION: 1.21.5 TAR_PATH: /tmp/terramoneycore.tar IMAGE_NAME: terramoneycore diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e32cba60..78c763b6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: 1.20.0 + go-version: 1.21.5 - uses: technote-space/get-diff-action@v6 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c6ef82fc..d887d0b6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: 1.20.0 + go-version: 1.21.5 - uses: technote-space/get-diff-action@v6 id: get-diff @@ -50,7 +50,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: 1.20.0 + go-version: 1.21.5 - uses: actions/checkout@v3 - name: simulate run: | diff --git a/Dockerfile b/Dockerfile index 172eb615..b716bef9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION="1.20" +ARG GO_VERSION="1.21.5" ARG ALPINE_VERSION="3.16" ARG BUILDPLATFORM=linux/amd64 ARG BASE_IMAGE="golang:${GO_VERSION}-alpine${ALPINE_VERSION}" diff --git a/Makefile b/Makefile index 7110efb9..a3ef2aa6 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ BINDIR ?= $(GOPATH)/bin BUILDDIR ?= $(CURDIR)/build DOCKER := $(shell which docker) SHA256_CMD = sha256sum -GO_VERSION ?= "1.20" +GO_VERSION ?= "1.21.5" # don't override user values ifeq (,$(VERSION)) VERSION := $(shell git describe --tags) diff --git a/go.mod b/go.mod index 8d0db47d..fecd9548 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/terra-money/core/v2 -go 1.20 +go 1.21.5 require ( cosmossdk.io/errors v1.0.0 diff --git a/integration-tests/README.md b/integration-tests/README.md index 5baaa345..1ad6d428 100644 --- a/integration-tests/README.md +++ b/integration-tests/README.md @@ -4,7 +4,7 @@ This project is meant to increase the success ratio of new core releases, improv ### Development -This set of tests must run out of the box in Linux-based systems installing [GoLang 1.20](https://go.dev/), [jq](https://stedolan.github.io/jq/) and [screen](https://www.geeksforgeeks.org/screen-command-in-linux-with-examples/). The relayer used in the tests is [go relayer](https://github.com/cosmos/relayer). Keep in mind that the data is not wiped out each time a new test is executed. +This set of tests must run out of the box in Linux-based systems installing [GoLang 1.21.5](https://go.dev/), [jq](https://stedolan.github.io/jq/) and [screen](https://www.geeksforgeeks.org/screen-command-in-linux-with-examples/). The relayer used in the tests is [go relayer](https://github.com/cosmos/relayer). Keep in mind that the data is not wiped out each time a new test is executed. Folders structure: diff --git a/interchaintest/go.mod b/interchaintest/go.mod index b835484e..9eaf0cd2 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -1,6 +1,6 @@ module github.com/terra-money/core/interchaintest -go 1.20 +go 1.21.5 replace ( // interchaintest supports ICS features so we need this for now diff --git a/shared.Dockerfile b/shared.Dockerfile index 00f257a8..c370bf3b 100644 --- a/shared.Dockerfile +++ b/shared.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20-buster AS go-builder +FROM golang:1.21.5-buster AS go-builder # Install minimum necessary dependencies, build Cosmos SDK, remove packages RUN apt update From 9b0a3317aaacade4403d48f82ae2dc6aba4547b2 Mon Sep 17 00:00:00 2001 From: emidev98 Date: Fri, 8 Dec 2023 08:57:37 +0200 Subject: [PATCH 2/2] fix: go docker image --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b716bef9..e85a7276 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION="1.21.5" -ARG ALPINE_VERSION="3.16" +ARG GO_VERSION="1.21" +ARG ALPINE_VERSION="3.17" ARG BUILDPLATFORM=linux/amd64 ARG BASE_IMAGE="golang:${GO_VERSION}-alpine${ALPINE_VERSION}" FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE} as base