From 3cf8b524e0d23ca52600c2878e62fb2a0111a549 Mon Sep 17 00:00:00 2001 From: Rootul Patel Date: Fri, 21 Jun 2024 11:50:10 -0400 Subject: [PATCH 1/2] chore(deps): upgrade to celestia-core v1.37.0-tm-v0.34.29 --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 25827b04c6..54e7eedd55 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/celestiaorg/celestia-app -go 1.22.3 +go 1.22.4 require ( github.com/celestiaorg/nmt v0.21.0 @@ -223,7 +223,7 @@ replace ( github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.12.4 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.36.0-tm-v0.34.29 + github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.37.0-tm-v0.34.29 ) // v1.8.0 was retracted due to a dependency bump in ibc resulting in a consensus diff --git a/go.sum b/go.sum index 0e9880815e..bd36a6b7f6 100644 --- a/go.sum +++ b/go.sum @@ -314,8 +314,8 @@ github.com/bufbuild/protocompile v0.5.1/go.mod h1:G5iLmavmF4NsYtpZFvE3B/zFch2GIY github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/celestiaorg/celestia-core v1.36.0-tm-v0.34.29 h1:qLsTxyS0CHMuMO4S0ug1Zntv+gFB6OVdDNmG3pz5mHI= -github.com/celestiaorg/celestia-core v1.36.0-tm-v0.34.29/go.mod h1:AL7kotb6ucKF4bpKKhGIzGhGL7dwYj2nFstiFC6PGxM= +github.com/celestiaorg/celestia-core v1.37.0-tm-v0.34.29 h1:9nJDE37cTg/Cx+f4FS2g7yYeoLrsaNJg36XsQ47sS1A= +github.com/celestiaorg/celestia-core v1.37.0-tm-v0.34.29/go.mod h1:IIdMu9gnDtjUmZkFuBN4Bf11z/rBtlL2rtwbQxdbRAU= github.com/celestiaorg/cosmos-sdk v1.23.0-sdk-v0.46.16 h1:N2uETI13szEKnGAdKhtTR0EsrpcW0AwRKYER74WLnuw= github.com/celestiaorg/cosmos-sdk v1.23.0-sdk-v0.46.16/go.mod h1:Bpl1LSWiDpQumgOhhMTZBMopqa0j7fRasIhvTZB44P0= github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 h1:CJdIpo8n5MFP2MwK0gSRcOVlDlFdQJO1p+FqdxYzmvc= From 3f759afe4af1619c4ba39637c024d3b51088f299 Mon Sep 17 00:00:00 2001 From: Rootul Patel Date: Fri, 21 Jun 2024 11:53:43 -0400 Subject: [PATCH 2/2] chore: upgrade to go 1.22.4 --- .github/workflows/ci-release.yml | 2 +- .github/workflows/lint.yml | 9 +++------ .github/workflows/nightly.yml | 7 ++----- .github/workflows/test.yml | 27 ++++++++++++--------------- Dockerfile | 2 +- Makefile | 2 +- README.md | 2 +- docker/Dockerfile.test | 2 +- docker/Dockerfile_ephemeral | 2 +- 9 files changed, 23 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 2af262fd63..f2a925ed04 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -80,7 +80,7 @@ jobs: - run: git fetch --force --tags - uses: actions/setup-go@v4 with: - go-version: 1.22.3 + go-version: 1.22.4 - name: Create .release-env file run: |- echo 'GITHUB_TOKEN=${{secrets.GORELEASER_ACCESS_TOKEN}}' >> .release-env diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3ff50dd8aa..51b4506706 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -2,19 +2,16 @@ name: lint on: workflow_call: -env: - GO_VERSION: '1.22.3' - jobs: golangci-lint: name: golangci-lint runs-on: ubuntu-latest timeout-minutes: 8 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: 'go.mod' - uses: technote-space/get-diff-action@v6.1.2 with: # This job will pass without running if go.mod, go.sum, and *.go diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a4bf10a08c..6d9a26c636 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -4,18 +4,15 @@ on: # runs every day at 6am UTC - cron: "0 6 * * *" -env: - GO_VERSION: '1.22.3' - jobs: e2e-tests: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: 'go.mod' - name: Setup kubeconfig env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2b66829229..745c4c2102 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,18 +2,15 @@ name: test on: workflow_call: -env: - GO_VERSION: '1.22.3' - jobs: test-short: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: 'go.mod' - name: Run tests in short mode run: make test-short @@ -22,11 +19,11 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: 'go.mod' - name: Run unit tests run: make test @@ -34,11 +31,11 @@ jobs: test-coverage: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: 'go.mod' - name: Generate coverage.txt run: make test-coverage @@ -51,11 +48,11 @@ jobs: test-race: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: 'go.mod' - name: Run unit tests in race mode run: make test-race diff --git a/Dockerfile b/Dockerfile index 55f466b860..c2e3538f8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # stage 1 Generate celestia-appd Binary -FROM docker.io/golang:1.22.3-alpine3.19 as builder +FROM docker.io/golang:1.22.4-alpine3.19 as builder # hadolint ignore=DL3018 RUN apk update && apk add --no-cache \ gcc \ diff --git a/Makefile b/Makefile index e26233681a..541c1f14c2 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ DOCKER_PROTO_BUILDER := docker run -v $(shell pwd):/workspace --workdir /workspa PROJECTNAME=$(shell basename "$(PWD)") HTTPS_GIT := https://github.com/celestiaorg/celestia-app.git PACKAGE_NAME := github.com/celestiaorg/celestia-app -GOLANG_CROSS_VERSION ?= v1.22.3 +GOLANG_CROSS_VERSION ?= v1.22.4 # process linker flags ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=celestia-app \ diff --git a/README.md b/README.md index bef49e0bd7..10209a30c5 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ node | | | | ### Source -1. [Install Go](https://go.dev/doc/install) 1.22.3 +1. [Install Go](https://go.dev/doc/install) 1.22.4 1. Clone this repo 1. Install the celestia-app CLI diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test index bc36be07e8..843069aadb 100644 --- a/docker/Dockerfile.test +++ b/docker/Dockerfile.test @@ -2,7 +2,7 @@ # > docker build -t celestia-app . # > docker run -it -p 46657:46657 -p 46656:46656 -v ~/.celestia-appd:/root/.celestia-appd -v ~/.celestia-appcli:/root/.celestia-appcli celestia-app celestia-appd init # > docker run -it -p 46657:46657 -p 46656:46656 -v ~/.celestia-appd:/root/.celestia-appd -v ~/.celestia-appcli:/root/.celestia-appcli celestia-app celestia-appd start -FROM docker.io/golang:1.22.3-alpine3.19 AS build-env +FROM docker.io/golang:1.22.4-alpine3.19 AS build-env # Set up dependencies ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python3 diff --git a/docker/Dockerfile_ephemeral b/docker/Dockerfile_ephemeral index 43fe13e4e9..92bfa872ad 100644 --- a/docker/Dockerfile_ephemeral +++ b/docker/Dockerfile_ephemeral @@ -1,5 +1,5 @@ # stage 1 Generate celestia-appd Binary -FROM docker.io/golang:1.22.3-alpine3.19 as builder +FROM docker.io/golang:1.22.4-alpine3.19 as builder RUN apk update && \ apk upgrade && \