Skip to content

Commit

Permalink
Merge pull request #468 from okp4/chore/bump-go-lang-1.21
Browse files Browse the repository at this point in the history
chore(deps): bump go to v1.21
  • Loading branch information
ccamel authored Oct 19, 2023
2 parents 178094a + 76905db commit 14c0114
Show file tree
Hide file tree
Showing 12 changed files with 53 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup Go environment
uses: actions/[email protected]
with:
go-version: '1.20'
go-version: '1.21'

- name: Build go project
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@ jobs:
uses: actions/[email protected]
if: steps.changed-go-files.outputs.any_changed == 'true'
with:
go-version: "1.20"
go-version: "1.21"
cache: false

- name: Lint go code (golangci-lint)
uses: golangci/golangci-lint-action@v3
if: steps.changed-go-files.outputs.any_changed == 'true'
with:
version: v1.53
version: v1.54

- name: Lint go code (gofumpt)
if: steps.changed-go-files.outputs.any_changed == 'true'
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
- name: Setup Go environment
uses: actions/[email protected]
with:
go-version: "1.20"
go-version: "1.21"
cache: false

- name: Initialize CodeQL
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
- name: Setup Go environment
uses: actions/[email protected]
with:
go-version: "1.20"
go-version: "1.21"

- name: Generate command documentation
run: |
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
- name: Setup Go environment
uses: actions/[email protected]
with:
go-version: "1.20"
go-version: "1.21"

- name: Setup Test infra
id: starship-action
uses: cosmology-tech/[email protected].12
uses: cosmology-tech/[email protected].18
with:
values: starship/configs/ci.yaml
port-forward: true
Expand All @@ -37,7 +37,6 @@ jobs:
- name: Run Tests
run: |
cd starship/
go mod tidy
make test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Setup Go environment
uses: actions/[email protected]
with:
go-version: "1.20"
go-version: "1.21"

- name: Test go project
run: |
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Setup Go environment
uses: actions/[email protected]
with:
go-version: "1.20"
go-version: "1.21"

- name: Install OKP4 blockchain
run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#--- Build stage
FROM golang:1.20-alpine3.16 AS go-builder
FROM golang:1.21-alpine3.17 AS go-builder

WORKDIR /src

Expand All @@ -9,7 +9,7 @@ ADD https://github.com/CosmWasm/wasmvm/releases/download/v1.2.4/libwasmvm_muslc.

# hadolint ignore=DL4006
RUN set -eux \
&& apk add --no-cache ca-certificates=20220614-r0 build-base=0.5-r3 git=2.36.6-r0 linux-headers=5.16.7-r1 \
&& apk add --no-cache ca-certificates=20230506-r0 build-base=0.5-r3 git=2.38.5-r0 linux-headers=5.19.5-r0 \
&& sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 682a54082e131eaff9beec80ba3e5908113916fcb8ddf7c668cb2d97cb94c13c \
&& sha256sum /lib/libwasmvm_muslc.x86_64.a | grep ce3d892377d2523cf563e01120cb1436f9343f80be952c93f66aa94f5737b661 \
&& cp "/lib/libwasmvm_muslc.$(uname -m).a" /lib/libwasmvm_muslc.a
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ CMD_ROOT :=./cmd/${BINARY_NAME}
LEDGER_ENABLED ?= true

# Docker images
DOCKER_IMAGE_GOLANG = golang:1.20-alpine3.16
DOCKER_IMAGE_GOLANG_CI = golangci/golangci-lint:v1.49
DOCKER_IMAGE_GOLANG = golang:1.21-alpine3.17
DOCKER_IMAGE_GOLANG_CI = golangci/golangci-lint:v1.54
DOCKER_IMAGE_BUF = okp4/buf-cosmos:1.4.7
DOCKER_BUILDX_BUILDER = okp4-builder
DOCKER_IMAGE_MARKDOWNLINT = thegeeklab/markdownlint-cli:0.32.2
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ OKP4 blockchain and hosted in the [okp4/contracts](https://github.com/okp4/contr

### Prerequisites

- install [Go] `1.20+` following instructions from the [official Go documentation](https://golang.org/doc/install);
- install [Go] `1.21+` following instructions from the [official Go documentation](https://golang.org/doc/install);
- use [gofumpt](https://github.com/mvdan/gofumpt) as formatter. You can integrate it in your favorite IDE following these [instructions](https://github.com/mvdan/gofumpt#installation) or invoke the makefile `make format-go`;
- verify that [Docker] is properly installed and if not, follow the [instructions](https://docs.docker.com) for your environment;
- verify that [`make`](https://fr.wikipedia.org/wiki/Make) is properly installed if you intend to use the provided `Makefile`.
Expand Down
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/okp4/okp4d

go 1.20
go 1.21

require (
cosmossdk.io/api v0.3.1
Expand Down
Loading

0 comments on commit 14c0114

Please sign in to comment.