Skip to content

Commit 28721bf

Browse files
antonydenyerkaralabefjleval-exec0xe3b0c4
authored
Go version upgrade (#1601)
* travis, Dockerfile, build: docker build and multi-arch publish combo * dockerfile: get rid of make and env, see if that fixes builds * Dockerfile: upgrade to Go 1.17 (#23465) * build, Dockerfile: bump Go to 1.18 * docker: speed up docker image build (#24796) This PR improves the docker build speed for repeated builds where go.mod and go.sum do no change, by placing the downloaded dependencies in a lower layer * build: add static linking support (#25492) This adds support for building statically-linked executables using ci.go. Static linking is enabled by default in Docker builds, making it possible to use the geth executable in any Docker image, regardless of the Linux distribution the Dockerfile is based on. Co-authored-by: Felix Lange <[email protected]> * Dockerfile: upgrade to Go 1.19 (#26195) * bump version v22.7.6 * fix lint * Update workflows to use go 1.19 * Remove android test * Ignore lint errors --------- Co-authored-by: Péter Szilágyi <[email protected]> Co-authored-by: Felix Lange <[email protected]> Co-authored-by: EXEC <[email protected]> Co-authored-by: 0xe3b0c4 <[email protected]>
1 parent 93c5f78 commit 28721bf

File tree

12 files changed

+384
-163
lines changed

12 files changed

+384
-163
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
branches:
1010
- master
1111
env:
12-
GO_VERSION: 1.16
12+
GO_VERSION: 1.19
1313
GOPATH: ${{ github.workspace }}/go
1414
WORKING_DIR: ${{ github.workspace }}/go/src/github.com/ethereum/go-ethereum
1515
jobs:

‎.github/workflows/pr.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- '**.md'
77
- .gitignore
88
env:
9-
GO_VERSION: 1.16
9+
GO_VERSION: 1.19
1010
jobs:
1111
lint:
1212
name: 'Code linters'
@@ -17,8 +17,9 @@ jobs:
1717
with:
1818
go-version: ${{ env.GO_VERSION }}
1919
- name: 'Check out project files'
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
2121
with:
22+
fetch-depth: '0'
2223
submodules: false
2324
- name: 'Prepare environment'
2425
run: |

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
tags:
88
- 'v*'
99
env:
10-
GO_VERSION: 1.16
10+
GO_VERSION: 1.19
1111
GOPATH: ${{ github.workspace }}/go
1212
WORKING_DIR: ${{ github.workspace }}/go/src/github.com/ethereum/go-ethereum
1313
jobs:

‎.golangci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ linters:
2323
- unconvert
2424
# - unused
2525
- varcheck
26+
- typecheck
27+
2628

2729
linters-settings:
2830
gofmt:
@@ -32,6 +34,7 @@ linters-settings:
3234
min-occurrences: 6 # minimum number of occurrences
3335

3436
issues:
37+
new-from-rev: c4e9657
3538
exclude-rules:
3639
- path: crypto/blake2b/
3740
linters:

‎.travis.yml‎

Lines changed: 58 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
allow_failures:
66
- stage: build
77
os: osx
8-
go: 1.15.x
8+
go: 1.17.x
99
env:
1010
- azure-osx
1111
- azure-ios
@@ -16,20 +16,56 @@ jobs:
1616
- stage: lint
1717
os: linux
1818
dist: bionic
19-
go: 1.16.x
19+
go: 1.18.x
2020
env:
2121
- lint
2222
git:
2323
submodules: false # avoid cloning ethereum/tests
2424
script:
2525
- go run build/ci.go lint
2626

27+
# These builders create the Docker sub-images for multi-arch push and each
28+
# will attempt to push the multi-arch image if they are the last builder
29+
- stage: build
30+
if: type = push
31+
os: linux
32+
arch: amd64
33+
dist: bionic
34+
go: 1.18.x
35+
env:
36+
- docker
37+
services:
38+
- docker
39+
git:
40+
submodules: false # avoid cloning ethereum/tests
41+
before_install:
42+
- export DOCKER_CLI_EXPERIMENTAL=enabled
43+
script:
44+
- go run build/ci.go docker -image -manifest amd64,arm64 -upload ethereum/client-go
45+
46+
- stage: build
47+
if: type = push
48+
os: linux
49+
arch: arm64
50+
dist: bionic
51+
go: 1.18.x
52+
env:
53+
- docker
54+
services:
55+
- docker
56+
git:
57+
submodules: false # avoid cloning ethereum/tests
58+
before_install:
59+
- export DOCKER_CLI_EXPERIMENTAL=enabled
60+
script:
61+
- go run build/ci.go docker -image -manifest amd64,arm64 -upload ethereum/client-go
62+
2763
# This builder does the Ubuntu PPA upload
2864
- stage: build
2965
if: type = push
3066
os: linux
3167
dist: bionic
32-
go: 1.16.x
68+
go: 1.18.x
3369
env:
3470
- ubuntu-ppa
3571
- GO111MODULE=on
@@ -54,7 +90,7 @@ jobs:
5490
os: linux
5591
dist: bionic
5692
sudo: required
57-
go: 1.16.x
93+
go: 1.18.x
5894
env:
5995
- azure-linux
6096
- GO111MODULE=on
@@ -84,36 +120,6 @@ jobs:
84120
- go run build/ci.go install -dlgo -arch arm64 -cc aarch64-linux-gnu-gcc
85121
- go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
86122

87-
# This builder does the Linux Azure MIPS xgo uploads
88-
- stage: build
89-
if: type = push
90-
os: linux
91-
dist: bionic
92-
services:
93-
- docker
94-
go: 1.16.x
95-
env:
96-
- azure-linux-mips
97-
- GO111MODULE=on
98-
git:
99-
submodules: false # avoid cloning ethereum/tests
100-
script:
101-
- go run build/ci.go xgo --alltools -- --targets=linux/mips --ldflags '-extldflags "-static"' -v
102-
- for bin in build/bin/*-linux-mips; do mv -f "${bin}" "${bin/-linux-mips/}"; done
103-
- go run build/ci.go archive -arch mips -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
104-
105-
- go run build/ci.go xgo --alltools -- --targets=linux/mipsle --ldflags '-extldflags "-static"' -v
106-
- for bin in build/bin/*-linux-mipsle; do mv -f "${bin}" "${bin/-linux-mipsle/}"; done
107-
- go run build/ci.go archive -arch mipsle -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
108-
109-
- go run build/ci.go xgo --alltools -- --targets=linux/mips64 --ldflags '-extldflags "-static"' -v
110-
- for bin in build/bin/*-linux-mips64; do mv -f "${bin}" "${bin/-linux-mips64/}"; done
111-
- go run build/ci.go archive -arch mips64 -type tar -signer LINUX_SIGNING_KEY signify SIGNIFY_KEY -upload gethstore/builds
112-
113-
- go run build/ci.go xgo --alltools -- --targets=linux/mips64le --ldflags '-extldflags "-static"' -v
114-
- for bin in build/bin/*-linux-mips64le; do mv -f "${bin}" "${bin/-linux-mips64le/}"; done
115-
- go run build/ci.go archive -arch mips64le -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
116-
117123
# This builder does the Android Maven and Azure uploads
118124
- stage: build
119125
if: type = push
@@ -142,7 +148,7 @@ jobs:
142148
- sdkmanager "platform-tools" "platforms;android-15" "platforms;android-19" "platforms;android-24" "ndk-bundle"
143149

144150
# Install Go to allow building with
145-
- curl https://dl.google.com/go/go1.16.linux-amd64.tar.gz | tar -xz
151+
- curl https://dl.google.com/go/go1.18.linux-amd64.tar.gz | tar -xz
146152
- export PATH=`pwd`/go/bin:$PATH
147153
- export GOROOT=`pwd`/go
148154
- export GOPATH=$HOME/go
@@ -156,7 +162,7 @@ jobs:
156162
- stage: build
157163
if: type = push
158164
os: osx
159-
go: 1.16.x
165+
go: 1.18.x
160166
env:
161167
- azure-osx
162168
- azure-ios
@@ -188,7 +194,7 @@ jobs:
188194
os: linux
189195
arch: amd64
190196
dist: bionic
191-
go: 1.16.x
197+
go: 1.18.x
192198
env:
193199
- GO111MODULE=on
194200
script:
@@ -199,7 +205,7 @@ jobs:
199205
os: linux
200206
arch: arm64
201207
dist: bionic
202-
go: 1.16.x
208+
go: 1.18.x
203209
env:
204210
- GO111MODULE=on
205211
script:
@@ -208,7 +214,7 @@ jobs:
208214
- stage: build
209215
os: linux
210216
dist: bionic
211-
go: 1.15.x
217+
go: 1.17.x
212218
env:
213219
- GO111MODULE=on
214220
script:
@@ -219,11 +225,23 @@ jobs:
219225
if: type = cron
220226
os: linux
221227
dist: bionic
222-
go: 1.16.x
228+
go: 1.18.x
223229
env:
224230
- azure-purge
225231
- GO111MODULE=on
226232
git:
227233
submodules: false # avoid cloning ethereum/tests
228234
script:
229235
- go run build/ci.go purge -store gethstore/builds -days 14
236+
237+
# This builder executes race tests
238+
- stage: build
239+
if: type = cron
240+
os: linux
241+
dist: bionic
242+
go: 1.18.x
243+
env:
244+
- GO111MODULE=on
245+
script:
246+
- go run build/ci.go test -race -coverage $TEST_PACKAGES
247+

‎Dockerfile‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
1+
# Support setting various labels on the final image
2+
ARG COMMIT=""
3+
ARG VERSION=""
4+
ARG BUILDNUM=""
5+
16
# Build Geth in a stock Go builder container
2-
FROM golang:1.16-alpine as builder
7+
FROM golang:1.19-alpine as builder
8+
9+
RUN apk add --no-cache gcc musl-dev linux-headers git
310

4-
RUN apk add --no-cache make gcc musl-dev linux-headers git
11+
# Get dependencies - will also be cached if we won't change go.mod/go.sum
12+
COPY go.mod /go-ethereum/
13+
COPY go.sum /go-ethereum/
14+
RUN cd /go-ethereum && go mod download
515

616
ADD . /go-ethereum
7-
RUN cd /go-ethereum && make geth bootnode
17+
RUN cd /go-ethereum && go run build/ci.go install -static ./cmd/geth
18+
RUN cd /go-ethereum && go run build/ci.go install -static ./cmd/bootnode
819

920
# Pull Geth into a second stage deploy alpine container
1021
FROM alpine:latest
@@ -15,3 +26,10 @@ COPY --from=builder /go-ethereum/build/bin/bootnode /usr/local/bin/
1526

1627
EXPOSE 8545 8546 30303 30303/udp
1728
ENTRYPOINT ["geth"]
29+
30+
# Add some metadata labels to help programatic image consumption
31+
ARG COMMIT=""
32+
ARG VERSION=""
33+
ARG BUILDNUM=""
34+
35+
LABEL commit="$COMMIT" version="$VERSION" buildnum="$BUILDNUM"

‎Dockerfile.alltools‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1+
# Support setting various labels on the final image
2+
ARG COMMIT=""
3+
ARG VERSION=""
4+
ARG BUILDNUM=""
5+
16
# Build Geth in a stock Go builder container
2-
FROM golang:1.16-alpine as builder
7+
FROM golang:1.19-alpine as builder
8+
9+
RUN apk add --no-cache gcc musl-dev linux-headers git
310

4-
RUN apk add --no-cache make gcc musl-dev linux-headers git
11+
# Get dependencies - will also be cached if we won't change go.mod/go.sum
12+
COPY go.mod /go-ethereum/
13+
COPY go.sum /go-ethereum/
14+
RUN cd /go-ethereum && go mod download
515

616
ADD . /go-ethereum
7-
RUN cd /go-ethereum && make all
17+
RUN cd /go-ethereum && go run build/ci.go install -static
818

919
# Pull all binaries into a second stage deploy alpine container
1020
FROM alpine:latest
@@ -13,3 +23,10 @@ RUN apk add --no-cache ca-certificates
1323
COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
1424

1525
EXPOSE 8545 8546 30303 30303/udp
26+
27+
# Add some metadata labels to help programatic image consumption
28+
ARG COMMIT=""
29+
ARG VERSION=""
30+
ARG BUILDNUM=""
31+
32+
LABEL commit="$COMMIT" version="$VERSION" buildnum="$BUILDNUM"

‎build/checksums.txt‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,37 @@
11
# This file contains sha256 checksums of optional build dependencies.
22

3-
b298d29de9236ca47a023e382313bcc2d2eed31dfa706b60a04103ce83a71a25 go1.16.3.src.tar.gz
4-
6bb1cf421f8abc2a9a4e39140b7397cdae6aca3e8d36dcff39a1a77f4f1170ac go1.16.3.darwin-amd64.tar.gz
5-
f4e96bbcd5d2d1942f5b55d9e4ab19564da4fad192012f6d7b0b9b055ba4208f go1.16.3.darwin-arm64.tar.gz
6-
48b2d1481db756c88c18b1f064dbfc3e265ce4a775a23177ca17e25d13a24c5d go1.16.3.linux-386.tar.gz
7-
951a3c7c6ce4e56ad883f97d9db74d3d6d80d5fec77455c6ada6c1f7ac4776d2 go1.16.3.linux-amd64.tar.gz
8-
566b1d6f17d2bc4ad5f81486f0df44f3088c3ed47a3bec4099d8ed9939e90d5d go1.16.3.linux-arm64.tar.gz
9-
0dae30385e3564a557dac7f12a63eedc73543e6da0f6017990e214ce8cc8797c go1.16.3.linux-armv6l.tar.gz
10-
a3c16e1531bf9726f47911c4a9ed7cb665a6207a51c44f10ebad4db63b4bcc5a go1.16.3.windows-386.zip
11-
a4400345135b36cb7942e52bbaf978b66814738b855eeff8de879a09fd99de7f go1.16.3.windows-amd64.zip
12-
31ecd11d497684fa8b0f01ba784590c4c760943665fdc4fe0adaa1405c71736c go1.16.3.freebsd-386.tar.gz
13-
ffbd920b309e62e807457b11d80e8c17fefe3ef6de423aaba4b1e270b2ca4c3d go1.16.3.freebsd-amd64.tar.gz
14-
5eb046bbbbc7fe2591846a4303884cb5a01abb903e3e61e33459affe7874e811 go1.16.3.linux-ppc64le.tar.gz
15-
3e8bd7bde533a73fd6fa75b5288678ef397e76c198cfb26b8ae086035383b1cf go1.16.3.linux-s390x.tar.gz
3+
38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6 go1.18.src.tar.gz
4+
70bb4a066997535e346c8bfa3e0dfe250d61100b17ccc5676274642447834969 go1.18.darwin-amd64.tar.gz
5+
9cab6123af9ffade905525d79fc9ee76651e716c85f1f215872b5f2976782480 go1.18.darwin-arm64.tar.gz
6+
e63492d4f38487331518eb4b50e670d853bb8d67e88596269af84bb9aca0b381 go1.18.freebsd-386.tar.gz
7+
01cd67bbc12e659ff236ecebde1806f76452f7ca145c172d5ecdbf4f4803daae go1.18.freebsd-amd64.tar.gz
8+
1c04cf4440b323a66328e0df95d409f955b9b475e58eae235fdd3d1f1cf02f4f go1.18.linux-386.tar.gz
9+
e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f go1.18.linux-amd64.tar.gz
10+
7ac7b396a691e588c5fb57687759e6c4db84a2a3bbebb0765f4b38e5b1c5b00e go1.18.linux-arm64.tar.gz
11+
a80fa43d1f4575fb030adbfbaa94acd860c6847820764eecb06c63b7c103612b go1.18.linux-armv6l.tar.gz
12+
070351edac192483c074b38d08ec19251a83f8210765a532a84c3dcf8aec04d8 go1.18.linux-ppc64le.tar.gz
13+
ea265f5e62fcaf941d53f0cdb81222d9668e1672a0d39d992f16ff0e87c0ee6b go1.18.linux-s390x.tar.gz
14+
e23fd2a0509690fe7e63b2b1bcd4c39ed57b46ccde76f35dc0d16ca7fdbc5aaa go1.18.windows-386.zip
15+
65c5c0c709a7ca1b357091b10b795b439d8b50e579d3893edab4c7e9b384f435 go1.18.windows-amd64.zip
16+
1c454eb60c64d481965a165c623ff1ed6cf32d68c6b31f36069c8768d908f093 go1.18.windows-arm64.zip
1617

17-
7e9a47ab540aa3e8472fbf8120d28bed3b9d9cf625b955818e8bc69628d7187c golangci-lint-1.39.0-darwin-amd64.tar.gz
18-
574daa2c9c299b01672a6daeb1873b5f12e413cdb6dc0e30f2ff163956778064 golangci-lint-1.39.0-darwin-arm64.tar.gz
19-
6225f7014987324ab78e9b511f294e3f25be013728283c33918c67c8576d543e golangci-lint-1.39.0-freebsd-386.tar.gz
20-
6b3e76e1e5eaf0159411c8e2727f8d533989d3bb19f10e9caa6e0b9619ee267d golangci-lint-1.39.0-freebsd-amd64.tar.gz
21-
a301cacfff87ed9b00313d95278533c25a4527a06b040a17d969b4b7e1b8a90d golangci-lint-1.39.0-freebsd-armv7.tar.gz
22-
25bfd96a29c3112f508d5e4fc860dbad7afce657233c343acfa20715717d51e7 golangci-lint-1.39.0-freebsd-armv6.tar.gz
23-
9687e4ff15545cfc722b0e46107a94195166a505023b48a316579af25ad09505 golangci-lint-1.39.0-linux-armv7.tar.gz
24-
a7fa7ab2bfc99cbe5e5bcbf5684f5a997f920afbbe2f253d2feb1001d5e3c8b3 golangci-lint-1.39.0-linux-armv6.tar.gz
25-
c8f9634115beddb4ed9129c1f7ecd4c97c99d07aeef33e3707234097eeb51b7b golangci-lint-1.39.0-linux-mips64le.tar.gz
26-
d1234c213b74751f1af413302dde0e9a6d4d29aecef034af7abb07dc1b6e887f golangci-lint-1.39.0-linux-arm64.tar.gz
27-
df25d9267168323b163147acb823ab0215a8a3bb6898a4a9320afdfedde66817 golangci-lint-1.39.0-linux-386.tar.gz
28-
1767e75fba357b7651b1a796d38453558f371c60af805505ec99e166908c04b5 golangci-lint-1.39.0-linux-ppc64le.tar.gz
29-
25fd75bf3186b3d930ecae10185689968fd18fd8fa6f9f555d6beb04348c20f6 golangci-lint-1.39.0-linux-s390x.tar.gz
30-
3a73aa7468087caa62673c8adea99b4e4dff846dc72707222db85f8679b40cbf golangci-lint-1.39.0-linux-amd64.tar.gz
31-
578caceccf81739bda67dbfec52816709d03608c6878888ecdc0e186a094a41b golangci-lint-1.39.0-linux-mips64.tar.gz
32-
494b66ba0e32c8ddf6c4f6b1d05729b110900f6017eda943057e43598c17d7a8 golangci-lint-1.39.0-windows-386.zip
33-
52ec2e13a3cbb47147244dff8cfc35103563deb76e0459133058086fc35fb2c7 golangci-lint-1.39.0-windows-amd64.zip
18+
d4bd25b9814eeaa2134197dd2c7671bb791eae786d42010d9d788af20dee4bfa golangci-lint-1.42.0-darwin-amd64.tar.gz
19+
e56859c04a2ad5390c6a497b1acb1cc9329ecb1010260c6faae9b5a4c35b35ea golangci-lint-1.42.0-darwin-arm64.tar.gz
20+
14d912a3fa856830339472fc4dc341933adf15f37bdb7130bbbfcf960ecf4809 golangci-lint-1.42.0-freebsd-386.tar.gz
21+
337257fccc9baeb5ee1cd7e70c153e9d9f59d3afde46d631659500048afbdf80 golangci-lint-1.42.0-freebsd-amd64.tar.gz
22+
6debcc266b629359fdd8eef4f4abb05a621604079d27016265afb5b4593b0eff golangci-lint-1.42.0-freebsd-armv6.tar.gz
23+
878f0e190169db2ce9dde8cefbd99adc4fe28b90b68686bbfcfcc2085e6d693e golangci-lint-1.42.0-freebsd-armv7.tar.gz
24+
42c78e31faf62b225363eff1b1d2aa74f9dbcb75686c8914aa3e90d6af65cece golangci-lint-1.42.0-linux-386.tar.gz
25+
6937f62f8e2329e94822dc11c10b871ace5557ae1fcc4ee2f9980cd6aecbc159 golangci-lint-1.42.0-linux-amd64.tar.gz
26+
2cf8d23d96cd854a537b355dab2962b960b88a06b615232599f066afd233f246 golangci-lint-1.42.0-linux-arm64.tar.gz
27+
08b003d1ed61367473886defc957af5301066e62338e5d96a319c34dadc4c1d1 golangci-lint-1.42.0-linux-armv6.tar.gz
28+
c7c00ec4845e806a1f32685f5b150219e180bd6d6a9d584be8d27f0c41d7a1bf golangci-lint-1.42.0-linux-armv7.tar.gz
29+
3650fcf29eb3d8ee326d77791a896b15259eb2d5bf77437dc72e7efe5af6bd40 golangci-lint-1.42.0-linux-mips64.tar.gz
30+
f51ae003fdbca4fef78ba73e2eb736a939c8eaa178cd452234213b489da5a420 golangci-lint-1.42.0-linux-mips64le.tar.gz
31+
1b0bb7b8b22cc4ea7da44fd5ad5faaf6111d0677e01cc6f961b62a96537de2c6 golangci-lint-1.42.0-linux-ppc64le.tar.gz
32+
8cb56927eb75e572450efbe0ff0f9cf3f56dc9faa81d9e8d30d6559fc1d06e6d golangci-lint-1.42.0-linux-riscv64.tar.gz
33+
5ac41cd31825a176b21505a371a7b307cd9cdf17df0f35bbb3bf1466f9356ccc golangci-lint-1.42.0-linux-s390x.tar.gz
34+
e1cebd2af621ac4b64c20937df92c3819264f2174c92f51e196db1e64ae097e0 golangci-lint-1.42.0-windows-386.zip
35+
7e70fcde8e87a17cae0455df07d257ebc86669f3968d568e12727fa24bbe9883 golangci-lint-1.42.0-windows-amd64.zip
36+
59da7ce1bda432616bfc28ae663e52c3675adee8d9bf5959fafd657c159576ab golangci-lint-1.42.0-windows-armv6.zip
37+
65f62dda937bfcede0326ac77abe947ce1548931e6e13298ca036cb31f224db5 golangci-lint-1.42.0-windows-armv7.zip

0 commit comments

Comments
 (0)