Skip to content

Commit 6a4390f

Browse files
committed
chore: upgrade to go 1.22
1 parent 044e22b commit 6a4390f

File tree

8 files changed

+16
-20
lines changed

8 files changed

+16
-20
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v3
2020
- uses: actions/setup-go@v5
2121
with:
22-
go-version: 1.19
22+
go-version: 1.22
2323
check-latest: true
2424
- uses: technote-space/[email protected]
2525
id: git_diff

.github/workflows/goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.19
18+
go-version: 1.22
1919
check-latest: true
2020
- name: release dry run
2121
run: make release-dry-run

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# Required: setup-go, for all versions v3.0.0+ of golangci-lint
1717
- uses: actions/setup-go@v5
1818
with:
19-
go-version: 1.19
19+
go-version: 1.22
2020
check-latest: true
2121
- uses: actions/checkout@v3
2222
- uses: technote-space/[email protected]

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/setup-go@v5
2222
with:
23-
go-version: 1.19
23+
go-version: 1.22
2424
check-latest: true
2525
- uses: actions/checkout@v3
2626
- uses: technote-space/[email protected]
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
- uses: actions/setup-go@v5
4949
with:
50-
go-version: 1.19
50+
go-version: 1.22
5151
check-latest: true
5252
- uses: actions/checkout@v3
5353
- uses: technote-space/[email protected]
@@ -68,7 +68,7 @@ jobs:
6868
steps:
6969
- uses: actions/setup-go@v5
7070
with:
71-
go-version: 1.19
71+
go-version: 1.22
7272
check-latest: true
7373
- uses: actions/checkout@v3
7474
- uses: technote-space/[email protected]

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/zeta-chain/ethermint
22

3-
go 1.19
3+
go 1.22
44

55
require (
66
cosmossdk.io/api v0.3.1

networks/local/ethermintnode/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ COPY . .
1818
RUN make build-linux
1919

2020
# Final image
21-
FROM golang:1.19 as final
21+
FROM golang:1.22 as final
2222

2323
WORKDIR /
2424

nix/default.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
{ sources ? import ./sources.nix, system ? builtins.currentSystem, ... }:
22

3+
let
4+
# use latest version of nixpkgs just for golang
5+
# upgrading this in sources.json breaks poetry2nix in incomprehensible ways
6+
nixpkgsUrl = "https://github.com/NixOS/nixpkgs/archive/e544a67ebac014e7932840e277363b0b46bac751.tar.gz";
7+
nixpkgs = import (fetchTarball nixpkgsUrl) {};
8+
go_1_22 = nixpkgs.pkgs.go_1_22;
9+
in
310
import sources.nixpkgs {
411
overlays = [
512
(_: pkgs: {
6-
go = pkgs.go_1_18;
13+
go = go_1_22;
714
go-ethereum = pkgs.callPackage ./go-ethereum.nix {
815
inherit (pkgs.darwin) libobjc;
916
inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
1017
buildGoModule = pkgs.buildGo118Module;
1118
};
1219
}) # update to a version that supports eip-1559
1320
# https://github.com/NixOS/nixpkgs/pull/179622
14-
(import ./go_1_18_overlay.nix)
1521
(final: prev:
1622
(import "${sources.gomod2nix}/overlay.nix")
1723
(final // {

nix/go_1_18_overlay.nix

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)