Skip to content

Commit

Permalink
chore: upgrade to go 1.22 (#142)
Browse files Browse the repository at this point in the history
* chore: upgrade to go 1.22

* fix yaml lint
  • Loading branch information
gartnera authored Oct 16, 2024
1 parent 044e22b commit 8db76d7
Show file tree
Hide file tree
Showing 9 changed files with 59 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 @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true
- uses: technote-space/[email protected]
id: git_diff
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true
- name: release dry run
run: make release-dry-run
Expand All @@ -25,4 +25,4 @@ jobs:
run: |-
echo 'GITHUB_TOKEN=${{secrets.GITHUB_TOKEN}}' > .release-env
- name: release publish
run: make release
run: make release
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
# Required: setup-go, for all versions v3.0.0+ of golangci-lint
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true
- uses: actions/checkout@v3
- uses: technote-space/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true
- uses: actions/checkout@v3
- uses: technote-space/[email protected]
Expand All @@ -47,7 +47,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true
- uses: actions/checkout@v3
- uses: technote-space/[email protected]
Expand All @@ -68,7 +68,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.22
check-latest: true
- uses: actions/checkout@v3
- uses: technote-space/[email protected]
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/zeta-chain/ethermint

go 1.19
go 1.22

require (
cosmossdk.io/api v0.3.1
Expand Down
42 changes: 42 additions & 0 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion networks/local/ethermintnode/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COPY . .
RUN make build-linux

# Final image
FROM golang:1.19 as final
FROM golang:1.22 as final

WORKDIR /

Expand Down
10 changes: 8 additions & 2 deletions nix/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
{ sources ? import ./sources.nix, system ? builtins.currentSystem, ... }:

let
# use latest version of nixpkgs just for golang
# upgrading this in sources.json breaks poetry2nix in incomprehensible ways
nixpkgsUrl = "https://github.com/NixOS/nixpkgs/archive/e544a67ebac014e7932840e277363b0b46bac751.tar.gz";
nixpkgs = import (fetchTarball nixpkgsUrl) {};
go_1_22 = nixpkgs.pkgs.go_1_22;
in
import sources.nixpkgs {
overlays = [
(_: pkgs: {
go = pkgs.go_1_18;
go = go_1_22;
go-ethereum = pkgs.callPackage ./go-ethereum.nix {
inherit (pkgs.darwin) libobjc;
inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
buildGoModule = pkgs.buildGo118Module;
};
}) # update to a version that supports eip-1559
# https://github.com/NixOS/nixpkgs/pull/179622
(import ./go_1_18_overlay.nix)
(final: prev:
(import "${sources.gomod2nix}/overlay.nix")
(final // {
Expand Down
10 changes: 0 additions & 10 deletions nix/go_1_18_overlay.nix

This file was deleted.

0 comments on commit 8db76d7

Please sign in to comment.