Skip to content

Commit cb7d7d3

Browse files
karalabekaralabe
authored
Merge pull request ethereum#3075 from ethereum/release/1.4
Geth 1.4.15: Come at me Bro
2 parents 8f0db69 + 1639f11 commit cb7d7d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1037
-896
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ matrix:
2727
- debhelper
2828
- dput
2929
script:
30-
- go run build/ci.go travis-debsrc
30+
- go run build/ci.go debsrc -signer "Felix Lange (Geth CI Testing Key) <[email protected]>" -upload ppa:lp-fjl/geth-ci-testing
3131

3232
install:
3333
- go get golang.org/x/tools/cmd/cover

‎Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ geth-linux: geth-linux-386 geth-linux-amd64 geth-linux-arm geth-linux-mips64 get
4242
@ls -ld $(GOBIN)/geth-linux-*
4343

4444
geth-linux-386:
45-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=linux/386 -v ./cmd/geth
45+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/386 -v ./cmd/geth
4646
@echo "Linux 386 cross compilation done:"
4747
@ls -ld $(GOBIN)/geth-linux-* | grep 386
4848

4949
geth-linux-amd64:
50-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=linux/amd64 -v ./cmd/geth
50+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/amd64 -v ./cmd/geth
5151
@echo "Linux amd64 cross compilation done:"
5252
@ls -ld $(GOBIN)/geth-linux-* | grep amd64
5353

@@ -56,32 +56,32 @@ geth-linux-arm: geth-linux-arm-5 geth-linux-arm-6 geth-linux-arm-7 geth-linux-ar
5656
@ls -ld $(GOBIN)/geth-linux-* | grep arm
5757

5858
geth-linux-arm-5:
59-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-5 -v ./cmd/geth
59+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-5 -v ./cmd/geth
6060
@echo "Linux ARMv5 cross compilation done:"
6161
@ls -ld $(GOBIN)/geth-linux-* | grep arm-5
6262

6363
geth-linux-arm-6:
64-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-6 -v ./cmd/geth
64+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-6 -v ./cmd/geth
6565
@echo "Linux ARMv6 cross compilation done:"
6666
@ls -ld $(GOBIN)/geth-linux-* | grep arm-6
6767

6868
geth-linux-arm-7:
69-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-7 -v ./cmd/geth
69+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm-7 -v ./cmd/geth
7070
@echo "Linux ARMv7 cross compilation done:"
7171
@ls -ld $(GOBIN)/geth-linux-* | grep arm-7
7272

7373
geth-linux-arm64:
74-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=linux/arm64 -v ./cmd/geth
74+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/arm64 -v ./cmd/geth
7575
@echo "Linux ARM64 cross compilation done:"
7676
@ls -ld $(GOBIN)/geth-linux-* | grep arm64
7777

7878
geth-linux-mips64:
79-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=linux/mips64 -v ./cmd/geth
79+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/mips64 -v ./cmd/geth
8080
@echo "Linux MIPS64 cross compilation done:"
8181
@ls -ld $(GOBIN)/geth-linux-* | grep mips64
8282

8383
geth-linux-mips64le:
84-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=linux/mips64le -v ./cmd/geth
84+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=linux/mips64le -v ./cmd/geth
8585
@echo "Linux MIPS64le cross compilation done:"
8686
@ls -ld $(GOBIN)/geth-linux-* | grep mips64le
8787

@@ -90,12 +90,12 @@ geth-darwin: geth-darwin-386 geth-darwin-amd64
9090
@ls -ld $(GOBIN)/geth-darwin-*
9191

9292
geth-darwin-386:
93-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=darwin/386 -v ./cmd/geth
93+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=darwin/386 -v ./cmd/geth
9494
@echo "Darwin 386 cross compilation done:"
9595
@ls -ld $(GOBIN)/geth-darwin-* | grep 386
9696

9797
geth-darwin-amd64:
98-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=darwin/amd64 -v ./cmd/geth
98+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=darwin/amd64 -v ./cmd/geth
9999
@echo "Darwin amd64 cross compilation done:"
100100
@ls -ld $(GOBIN)/geth-darwin-* | grep amd64
101101

@@ -104,21 +104,21 @@ geth-windows: geth-windows-386 geth-windows-amd64
104104
@ls -ld $(GOBIN)/geth-windows-*
105105

106106
geth-windows-386:
107-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=windows/386 -v ./cmd/geth
107+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=windows/386 -v ./cmd/geth
108108
@echo "Windows 386 cross compilation done:"
109109
@ls -ld $(GOBIN)/geth-windows-* | grep 386
110110

111111
geth-windows-amd64:
112-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=windows/amd64 -v ./cmd/geth
112+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=windows/amd64 -v ./cmd/geth
113113
@echo "Windows amd64 cross compilation done:"
114114
@ls -ld $(GOBIN)/geth-windows-* | grep amd64
115115

116116
geth-android:
117-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=android-21/aar -v ./cmd/geth
117+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=android-21/aar -v ./cmd/geth
118118
@echo "Android cross compilation done:"
119119
@ls -ld $(GOBIN)/geth-android-*
120120

121121
geth-ios:
122-
build/env.sh go run build/ci.go xgo --go=$(GO) --dest=$(GOBIN) --targets=ios-7.0/framework -v ./cmd/geth
122+
build/env.sh go run build/ci.go xgo -- --go=$(GO) --dest=$(GOBIN) --targets=ios-7.0/framework -v ./cmd/geth
123123
@echo "iOS framework cross compilation done:"
124124
@ls -ld $(GOBIN)/geth-ios-*

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.13
1+
1.4.15

‎appveyor.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,28 @@ clone_depth: 5
66
version: "{branch}.{build}"
77
environment:
88
global:
9+
# Go stuff
910
GOPATH: c:\gopath
10-
11-
# cache choco package files so we don't hit sourceforge all
12-
# the time.
13-
cache:
14-
- c:\cache
11+
GO: c:\go\bin\go
12+
GOROOT: c:\go
13+
CC: C:\msys64\mingw64\bin\gcc.exe
14+
# MSYS2 stuff
15+
MSYS2_ARCH: x86_64
16+
MSYSTEM: MINGW64
17+
PATH: C:\msys64\mingw64\bin\;%PATH%
1518

1619
install:
17-
- cmd: choco install --cache c:\cache golang mingw | find /v "Extracting "
18-
- refreshenv
19-
- cd c:\gopath\src\github.com\ethereum\go-ethereum
20+
- "%GO% version"
21+
- "%CC% --version"
2022

2123
build_script:
22-
- go run build\ci.go install
24+
- "%GO% run build\\ci.go install"
2325

2426
test_script:
25-
- go run build\ci.go test -vet -coverage
27+
- "%GO% run build\\ci.go test -vet -coverage"
2628

2729
after_build:
28-
- go run build\ci.go archive -type zip
30+
- "%GO% run build\\ci.go archive -type zip"
2931

3032
artifacts:
3133
- path: geth-*.zip

‎build/ci-notes.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
Debian Packaging
2-
----------------
1+
# Debian Packaging
32

43
Tagged releases and develop branch commits are available as installable Debian packages
54
for Ubuntu. Packages are built for the all Ubuntu versions which are supported by
@@ -8,6 +7,7 @@ Canonical:
87
- Trusty Tahr (14.04 LTS)
98
- Wily Werewolf (15.10)
109
- Xenial Xerus (16.04 LTS)
10+
- Yakkety Yak (16.10)
1111

1212
Packages of develop branch commits have suffix -unstable and cannot be installed alongside
1313
the stable version. Switching between release streams requires user intervention.
@@ -21,6 +21,29 @@ variable which Travis CI makes available to certain builds.
2121
We want to build go-ethereum with the most recent version of Go, irrespective of the Go
2222
version that is available in the main Ubuntu repository. In order to make this possible,
2323
our PPA depends on the ~gophers/ubuntu/archive PPA. Our source package build-depends on
24-
golang-1.6, which is co-installable alongside the regular golang package. PPA dependencies
24+
golang-1.7, which is co-installable alongside the regular golang package. PPA dependencies
2525
can be edited at https://launchpad.net/%7Elp-fjl/+archive/ubuntu/geth-ci-testing/+edit-dependencies
2626

27+
## Building Packages Locally (for testing)
28+
29+
You need to run Ubuntu to do test packaging.
30+
31+
Add the gophers PPA and install Go 1.7 and Debian packaging tools:
32+
33+
$ sudo apt-add-repository ppa:gophers/ubuntu/archive
34+
$ sudo apt-get update
35+
$ sudo apt-get install build-essential golang-1.7 devscripts debhelper
36+
37+
Create the source packages:
38+
39+
$ go run build/ci.go debsrc -workdir dist
40+
41+
Then go into the source package directory for your running distribution and build the package:
42+
43+
$ cd dist/ethereum-unstable-1.5.0+xenial
44+
$ dpkg-buildpackage
45+
46+
Built packages are placed in the dist/ directory.
47+
48+
$ cd ..
49+
$ dpkg-deb -c geth-unstable_1.5.0+xenial_amd64.deb

0 commit comments

Comments
 (0)