Skip to content

Commit fed692f

Browse files
obscurenobscuren
authored
Merge pull request ethereum#2916 from ethereum/release/1.4
Release/1.4
2 parents 5f55d95 + 99a0c76 commit fed692f

Some content is hidden

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

53 files changed

+1364
-1810
lines changed

‎.gitignore

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,11 @@ Godeps/_workspace/bin
2323
.project
2424
.settings
2525

26-
deploy/osx/Mist.app
27-
deploy/osx/Mist\ Installer.dmg
28-
cmd/mist/assets/ext/ethereum.js/
29-
3026
# used by the Makefile
3127
/build/_workspace/
3228
/build/bin/
29+
/geth*.zip
3330

3431
# travis
3532
profile.tmp
3633
profile.cov
37-
38-
# vagrant
39-
.vagrant

‎.gitmodules

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

‎.travis.yml

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,45 @@
11
language: go
2-
go:
3-
- 1.4.2
4-
- 1.5.4
5-
- 1.6.2
2+
go_import_path: github.com/ethereum/go-ethereum
3+
sudo: false
4+
matrix:
5+
include:
6+
- os: linux
7+
dist: trusty
8+
go: 1.4.2
9+
- os: linux
10+
dist: trusty
11+
go: 1.5.4
12+
- os: linux
13+
dist: trusty
14+
go: 1.6.2
15+
- os: osx
16+
go: 1.6.2
17+
18+
# This builder does the PPA upload (and nothing else).
19+
- os: linux
20+
dist: trusty
21+
go: 1.6.2
22+
env: PPA
23+
addons:
24+
apt:
25+
packages:
26+
- devscripts
27+
- debhelper
28+
- dput
29+
script:
30+
- go run build/ci.go travis-debsrc
31+
632
install:
7-
# - go get code.google.com/p/go.tools/cmd/goimports
8-
# - go get github.com/golang/lint/golint
9-
# - go get golang.org/x/tools/cmd/vet
1033
- go get golang.org/x/tools/cmd/cover
11-
before_script:
12-
# - gofmt -l -w .
13-
# - goimports -l -w .
14-
# - golint .
15-
# - go vet ./...
16-
# - go test -race ./...
1734
script:
18-
- make travis-test-with-coverage
35+
- go run build/ci.go install
36+
- go run build/ci.go test -coverage -vet
1937
after_success:
20-
- bash <(curl -s https://codecov.io/bash)
21-
env:
22-
global:
23-
- secure: "U2U1AmkU4NJBgKR/uUAebQY87cNL0+1JHjnLOmmXwxYYyj5ralWb1aSuSH3qSXiT93qLBmtaUkuv9fberHVqrbAeVlztVdUsKAq7JMQH+M99iFkC9UiRMqHmtjWJ0ok4COD1sRYixxi21wb/JrMe3M1iL4QJVS61iltjHhVdM64="
24-
sudo: false
38+
# - go run build/ci.go archive -type tar
39+
2540
notifications:
2641
webhooks:
2742
urls:
2843
- https://webhooks.gitter.im/e/e09ccdce1048c5e03445
2944
on_success: change
3045
on_failure: always
31-
on_start: false

‎Godeps/Godeps.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/github.com/ethereum/ethash/setup.py

100644100755
File mode changed.

‎Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/endian.h

Lines changed: 14 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/github.com/ethereum/ethash/src/libethash/internal.c

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/github.com/rjeczalik/notify/.travis.yml

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/github.com/rjeczalik/notify/appveyor.yml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Godeps/_workspace/src/github.com/rjeczalik/notify/watcher_fsevents.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)