Skip to content

Commit 650a5dd

Browse files
committed
feat: use go 1.22
1 parent 94fcd7d commit 650a5dd

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.github/workflows/l2geth_ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Install Go
2222
uses: actions/setup-go@v2
2323
with:
24-
go-version: 1.21.x
24+
go-version: 1.22.x
2525

2626
- name: Checkout code
2727
uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
3939
- name: Install Go
4040
uses: actions/setup-go@v2
4141
with:
42-
go-version: 1.21.x
42+
go-version: 1.22.x
4343

4444
- name: Install rust
4545
uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
@@ -66,7 +66,7 @@ jobs:
6666
- name: Install Go
6767
uses: actions/setup-go@v2
6868
with:
69-
go-version: 1.21.x
69+
go-version: 1.22.x
7070

7171
- name: Checkout code
7272
uses: actions/checkout@v2
@@ -111,7 +111,7 @@ jobs:
111111
- name: Install Go
112112
uses: actions/setup-go@v2
113113
with:
114-
go-version: 1.21.x
114+
go-version: 1.22.x
115115

116116
- name: Checkout code
117117
uses: actions/checkout@v2
@@ -134,7 +134,7 @@ jobs:
134134
- name: Install Go
135135
uses: actions/setup-go@v2
136136
with:
137-
go-version: 1.21.x
137+
go-version: 1.22.x
138138

139139
- name: Checkout code
140140
uses: actions/checkout@v2

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BUILDNUM=""
55
ARG SCROLL_LIB_PATH=/scroll/lib
66

77
# Build libzkp dependency
8-
FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as chef
8+
FROM scrolltech/go-rust-builder:go-1.22-rust-nightly-2023-12-03 as chef
99
WORKDIR app
1010

1111
FROM chef as planner
@@ -22,7 +22,7 @@ RUN cargo clean
2222
RUN cargo build --release
2323

2424
# Build Geth in a stock Go builder container
25-
FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as builder
25+
FROM scrolltech/go-rust-builder:go-1.22-rust-nightly-2023-12-03 as builder
2626

2727
ADD . /go-ethereum
2828

Dockerfile.alltools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG VERSION=""
44
ARG BUILDNUM=""
55

66
# Build Geth in a stock Go builder container
7-
FROM golang:1.21-alpine as builder
7+
FROM golang:1.22-alpine as builder
88

99
RUN apk add --no-cache gcc musl-dev linux-headers git
1010

Dockerfile.mockccc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BUILDNUM=""
55
ARG SCROLL_LIB_PATH=/scroll/lib
66

77
# Build Geth in a stock Go builder container
8-
FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as builder
8+
FROM scrolltech/go-rust-builder:go-1.22-rust-nightly-2023-12-03 as builder
99

1010
WORKDIR /go-ethereum
1111
COPY go.mod go.sum ./

Dockerfile.mockccc.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG VERSION=""
44
ARG BUILDNUM=""
55

66
# Build Geth in a stock Go builder container
7-
FROM golang:1.21-alpine as builder
7+
FROM golang:1.22-alpine as builder
88

99
RUN apk add --no-cache gcc musl-dev linux-headers git
1010

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/scroll-tech/go-ethereum
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/Azure/azure-storage-blob-go v0.7.0

0 commit comments

Comments
 (0)