Skip to content

Commit

Permalink
ci: bump to golang v1.21 (#1698)
Browse files Browse the repository at this point in the history
* feat: bump to golang v1.21

* ci: bump golang cross version to 1.21.5

* fix: osxcross directory changed

* Update CHANGELOG.md

Run markdown linter on changelog.md
  • Loading branch information
k-yang authored Dec 7, 2023
1 parent b4e380c commit f4d0933
Show file tree
Hide file tree
Showing 12 changed files with 133 additions and 91 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.21
cache: false # the golangci-lint action already caches for us (https://github.com/golangci/golangci-lint-action#performance)

# Use GitHub actions output paramters to get go paths. For more info, see
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.21
cache: true

# Use GitHub actions output paramters to get go paths. For more info, see
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.21
cache: true
- uses: actions/cache@v3
with:
Expand All @@ -33,7 +33,7 @@ jobs:
go.sum
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.21
cache: true
if: env.GIT_DIFF
- uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.21
cache: true

# Use GitHub actions output paramters to get go paths. For more info, see
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.21

- name: Build the nibid binary
run: make build
154 changes: 79 additions & 75 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19 AS builder
FROM golang:1.21 AS builder

WORKDIR /nibiru

Expand Down
2 changes: 1 addition & 1 deletion contrib/docker/chaosnet.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19 AS builder
FROM golang:1.21 AS builder

WORKDIR /nibiru

Expand Down
2 changes: 1 addition & 1 deletion contrib/docker/goreleaser.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19 AS builder
FROM golang:1.21 AS builder

WORKDIR /root
COPY dist/ /root/
Expand Down
5 changes: 2 additions & 3 deletions contrib/make/release.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
###############################################################################

PACKAGE_NAME := github.com/NibiruChain/nibiru
GOLANG_CROSS_VERSION ?= v1.19.4
GOLANG_CROSS_VERSION ?= v1.21.5

release:
docker run \
Expand All @@ -23,6 +23,5 @@ release-snapshot:
-v "$(CURDIR)":/go/src/$(PACKAGE_NAME) \
-w /go/src/$(PACKAGE_NAME) \
-e CGO_ENABLED=1 \
-e GITHUB_TOKEN=${GITHUB_TOKEN} \
goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
release --rm-dist --snapshot
release --clean --snapshot
6 changes: 3 additions & 3 deletions contrib/scripts/release_pre_darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
set -e

WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | awk '{sub(/^v/, "", $2); print $2}')
wget https://github.com/CosmWasm/wasmvm/releases/download/v${WASMVM_VERSION}/libwasmvmstatic_darwin.a -O /osxcross/target/SDK/MacOSX12.0.sdk/usr/lib/libwasmvmstatic_darwin.a
wget https://github.com/CosmWasm/wasmvm/releases/download/v${WASMVM_VERSION}/libwasmvmstatic_darwin.a -O /usr/local/osxcross/SDK/MacOSX12.0.sdk/usr/lib/libwasmvmstatic_darwin.a
wget https://github.com/NibiruChain/gorocksdb/releases/download/v8.1.1/include.8.1.1.tar.gz -O /root/include.8.1.1.tar.gz
tar -xf /root/include.8.1.1.tar.gz -C /osxcross/target/SDK/MacOSX12.0.sdk/usr/include/
tar -xf /root/include.8.1.1.tar.gz -C /usr/local/osxcross/SDK/MacOSX12.0.sdk/usr/include/
wget https://github.com/NibiruChain/gorocksdb/releases/download/v8.1.1/librocksdb_8.1.1_darwin_all.tar.gz -O /root/librocksdb_8.1.1_darwin_all.tar.gz
tar -xf /root/librocksdb_8.1.1_darwin_all.tar.gz -C /osxcross/target/SDK/MacOSX12.0.sdk/usr/lib/
tar -xf /root/librocksdb_8.1.1_darwin_all.tar.gz -C /usr/local/osxcross/SDK/MacOSX12.0.sdk/usr/lib/
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/NibiruChain/nibiru

go 1.19
go 1.21

require (
cosmossdk.io/errors v1.0.0
Expand Down
39 changes: 39 additions & 0 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit f4d0933

Please sign in to comment.