Skip to content

Commit 27d93c1

Browse files
authored
build: add -dlgo flag in ci.go (#21824)
This new flag downloads a known version of Go and builds with it. This is meant for environments where we can't easily upgrade the installed Go version. * .travis.yml: remove install step for PR test builders We added this step originally to avoid re-building everything for every test. go test has become much smarter in recent go releases, so we no longer need to install anything here.
1 parent 70868b1 commit 27d93c1

File tree

6 files changed

+246
-101
lines changed

6 files changed

+246
-101
lines changed

.travis.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
env:
3232
- GO111MODULE=on
3333
script:
34-
- go run build/ci.go install
3534
- go run build/ci.go test -coverage $TEST_PACKAGES
3635

3736
# These are the latest Go versions.
@@ -43,7 +42,6 @@ jobs:
4342
env:
4443
- GO111MODULE=on
4544
script:
46-
- go run build/ci.go install
4745
- go run build/ci.go test -coverage $TEST_PACKAGES
4846

4947
- stage: build
@@ -55,7 +53,6 @@ jobs:
5553
env:
5654
- GO111MODULE=on
5755
script:
58-
- go run build/ci.go install
5956
- go run build/ci.go test -coverage $TEST_PACKAGES
6057

6158
- stage: build
@@ -74,7 +71,6 @@ jobs:
7471
- ulimit -S -n $NOFILE
7572
- ulimit -n
7673
- unset -f cd # workaround for https://github.com/travis-ci/travis-ci/issues/8703
77-
- go run build/ci.go install
7874
- go run build/ci.go test -coverage $TEST_PACKAGES
7975

8076
# This builder does the Ubuntu PPA upload
@@ -99,7 +95,7 @@ jobs:
9995
- python-paramiko
10096
script:
10197
- echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
102-
- go run build/ci.go debsrc -goversion 1.15 -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
98+
- go run build/ci.go debsrc -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
10399

104100
# This builder does the Linux Azure uploads
105101
- stage: build
@@ -119,22 +115,22 @@ jobs:
119115
- gcc-multilib
120116
script:
121117
# Build for the primary platforms that Trusty can manage
122-
- go run build/ci.go install
118+
- go run build/ci.go install -dlgo
123119
- go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
124-
- go run build/ci.go install -arch 386
120+
- go run build/ci.go install -dlgo -arch 386
125121
- go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
126122

127123
# Switch over GCC to cross compilation (breaks 386, hence why do it here only)
128124
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install gcc-arm-linux-gnueabi libc6-dev-armel-cross gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
129125
- sudo ln -s /usr/include/asm-generic /usr/include/asm
130126

131-
- GOARM=5 go run build/ci.go install -arch arm -cc arm-linux-gnueabi-gcc
127+
- GOARM=5 go run build/ci.go install -dlgo -arch arm -cc arm-linux-gnueabi-gcc
132128
- GOARM=5 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
133-
- GOARM=6 go run build/ci.go install -arch arm -cc arm-linux-gnueabi-gcc
129+
- GOARM=6 go run build/ci.go install -dlgo -arch arm -cc arm-linux-gnueabi-gcc
134130
- GOARM=6 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
135-
- GOARM=7 go run build/ci.go install -arch arm -cc arm-linux-gnueabihf-gcc
131+
- GOARM=7 go run build/ci.go install -dlgo -arch arm -cc arm-linux-gnueabihf-gcc
136132
- GOARM=7 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
137-
- go run build/ci.go install -arch arm64 -cc aarch64-linux-gnu-gcc
133+
- go run build/ci.go install -dlgo -arch arm64 -cc aarch64-linux-gnu-gcc
138134
- go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -upload gethstore/builds
139135

140136
# This builder does the Linux Azure MIPS xgo uploads
@@ -219,7 +215,7 @@ jobs:
219215
git:
220216
submodules: false # avoid cloning ethereum/tests
221217
script:
222-
- go run build/ci.go install
218+
- go run build/ci.go install -dlgo
223219
- go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload gethstore/builds
224220

225221
# Build the iOS framework and upload it to CocoaPods and Azure

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ install:
3030
- gcc --version
3131

3232
build_script:
33-
- go run build\ci.go install
33+
- go run build\ci.go install -dlgo
3434

3535
after_build:
3636
- go run build\ci.go archive -type zip -signer WINDOWS_SIGNING_KEY -upload gethstore/builds

build/checksums.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# This file contains sha256 checksums of optional build dependencies.
22

3-
69438f7ed4f532154ffaf878f3dfd83747e7a00b70b3556eddabf7aaee28ac3a go1.15.src.tar.gz
3+
063da6a9a4186b8118a0e584532c8c94e65582e2cd951ed078bfd595d27d2367 go1.15.4.src.tar.gz
4+
aaf8c5323e0557211680960a8f51bedf98ab9a368775a687d6cf1f0079232b1d go1.15.4.darwin-amd64.tar.gz
5+
6b2f6d8afddfb198bf0e36044084dc4db4cb0be1107375240b34d215aa5ff6ad go1.15.4.linux-386.tar.gz
6+
eb61005f0b932c93b424a3a4eaa67d72196c79129d9a3ea8578047683e2c80d5 go1.15.4.linux-amd64.tar.gz
7+
6f083b453484fc5f95afb345547a58ccc957cde91348b7a7c68f5b060e488c85 go1.15.4.linux-arm64.tar.gz
8+
fe449ad3e121472e5db2f70becc0fef9d1a7188616c0605ada63f1e3bbad280e go1.15.4.linux-armv6l.tar.gz
9+
3be3cfc08ccc7e7056fdee17b6f5d18e9d7f3d1351dcfec8de34b1c95cb05b50 go1.15.4.windows-386.zip
10+
3593204e3851be577e4209900ece031b36f1e9ce1671f3f3221c9af7a090a941 go1.15.4.windows-amd64.zip
411

512
d998a84eea42f2271aca792a7b027ca5c1edfcba229e8e5a844c9ac3f336df35 golangci-lint-1.27.0-linux-armv7.tar.gz
613
bf781f05b0d393b4bf0a327d9e62926949a4f14d7774d950c4e009fc766ed1d4 golangci-lint.exe-1.27.0-windows-amd64.zip

0 commit comments

Comments
 (0)