From 5857d02a7a947cd367769afb6d733fd508a3f13e Mon Sep 17 00:00:00 2001 From: William Chong Date: Thu, 25 May 2023 22:35:24 +0800 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20go=20to=201.19.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- .github/workflows/goreleaser.yml | 2 +- .github/workflows/lint.yml | 4 ++-- .github/workflows/test.yml | 2 +- .tool-versions | 2 +- CHANGELOG.md | 1 + Dockerfile | 3 ++- Makefile | 4 ++-- README.md | 2 +- deploy/.tool-versions | 2 +- deploy/README.md | 2 +- deploy/go.mod | 2 +- docker/Dockerfile | 2 +- go.mod | 2 +- 14 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c7b7fa46e..0e98e8425a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.18.3 + go-version: 1.19.5 - name: Build binary file run: | make build diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index a22192fa54..183f3abe0c 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -14,7 +14,7 @@ jobs: submodules: true - uses: actions/setup-go@v3 with: - go-version: 1.18.3 + go-version: 1.19.5 - name: Setup release env env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2b9dd37abd..3ad2064865 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.18.3 + go-version: 1.19.5 - name: Install golint run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.44.0 # TODO: Remove after fixing lint @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.18.3 + go-version: 1.19.5 # TODO: Remove after fixing format - name: Run format check if: ${{ false }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 574ff61793..358b63d52c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,6 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.18.3 + go-version: 1.19.5 - name: Run go test run: make test diff --git a/.tool-versions b/.tool-versions index 00c8508d03..32603da96a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -golang 1.18.3 +golang 1.19.9 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c3e2d89a7..2ff9f78597 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [v4.0.0](https://github.com/likecoin/likecoin-chain/releases/v4.0.0) +- Upgrade golang to 1.19.5 - Upgrade cosmos-sdk to 0.46.12 - Upgrade ibc-go to 5.3.1 - Remove x/nft backport diff --git a/Dockerfile b/Dockerfile index d74089a47e..729c410f44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM likecoin/rbuilder:go1.18.3 as builder +FROM likecoin/rbuilder:go1.19.5 as builder USER root ARG LIKED_VERSION=unknown @@ -11,6 +11,7 @@ RUN tar -xzvf cosmovisor-v1.3.0-linux-amd64.tar.gz USER builder COPY . /sources WORKDIR /sources +RUN git config --global --add safe.directory /sources ENV TARGET_PLATFORMS='linux/amd64' ENV APP='liked' diff --git a/Makefile b/Makefile index d8a36fb5fe..dacef0520f 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,10 @@ DOCKER := $(shell which docker) DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.8.0 LIKE_HOME := '$(HOME)/.liked' IMAGE_TAG = likecoin/likecoin-chain:$(VERSION) -RBUILDER_IMAGE_TAG = likecoin/rbuilder:go1.18.3 +RBUILDER_IMAGE_TAG = likecoin/rbuilder:go1.19.5 BUILDDIR ?= $(CURDIR)/build GOPATH ?= '$(HOME)/go' -GOLANG_VERSION ?= 1.18.3 +GOLANG_VERSION ?= 1.19.5 GOLANG_CROSS_VERSION := v$(GOLANG_VERSION) ############################################################################### diff --git a/README.md b/README.md index 25ca8579ce..1c02472c9e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ LikeCoin chain is a blockchain built on the Cosmos SDK. Project page: https://li ## Requirements -- Go 1.18 +- Go 1.19 ## For development. diff --git a/deploy/.tool-versions b/deploy/.tool-versions index 00c8508d03..333af93954 100644 --- a/deploy/.tool-versions +++ b/deploy/.tool-versions @@ -1 +1 @@ -golang 1.18.3 +golang 1.19.5 \ No newline at end of file diff --git a/deploy/README.md b/deploy/README.md index 37af0438d5..c53c26ad8a 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -5,7 +5,7 @@ This document describe how to use Pulumi to set up devnet that support developme # Prerequisites - [Pulumi](https://www.pulumi.com/docs/get-started/install/) -- Go 1.18 +- Go 1.19 - [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-macos) (for azure nodes) - [Gcloud CLI](https://cloud.google.com/sdk/docs/install-sdk) (for gcp nodes) diff --git a/deploy/go.mod b/deploy/go.mod index bfac609be0..8608e9cdae 100644 --- a/deploy/go.mod +++ b/deploy/go.mod @@ -1,6 +1,6 @@ module deploy -go 1.18 +go 1.19 require ( github.com/pulumi/pulumi-azure-native/sdk v1.55.0 diff --git a/docker/Dockerfile b/docker/Dockerfile index 302f365988..6d35ce2720 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18.3-alpine AS base +FROM golang:1.19.5-alpine AS base RUN apk update && apk add --no-cache build-base git bash curl linux-headers ca-certificates WORKDIR / diff --git a/go.mod b/go.mod index 1b89c2e6ab..4ece5b85b7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/likecoin/likecoin-chain/v4 -go 1.18 +go 1.19 require ( github.com/cosmos/cosmos-sdk v0.46.12