Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
e43bc362
Unverified
Commit
e43bc362
authored
Feb 26, 2019
by
Samuel Marks
Committed by
Péter Szilágyi
Feb 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
travis, appveyor, Dockerfile: upgrade to Go 1.12
parent
7ebd2fa5
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
19 deletions
+30
-19
.travis.yml
.travis.yml
+21
-10
Dockerfile
Dockerfile
+1
-1
Dockerfile.alltools
Dockerfile.alltools
+1
-1
appveyor.yml
appveyor.yml
+2
-2
tx_pool_test.go
core/tx_pool_test.go
+1
-1
main_test.go
crypto/bn256/cloudflare/main_test.go
+1
-1
main_test.go
crypto/bn256/google/main_test.go
+1
-1
util.go
internal/build/util.go
+2
-2
No files found.
.travis.yml
View file @
e43bc362
...
@@ -14,7 +14,6 @@ matrix:
...
@@ -14,7 +14,6 @@ matrix:
-
go run build/ci.go install
-
go run build/ci.go install
-
go run build/ci.go test -coverage $TEST_PACKAGES
-
go run build/ci.go test -coverage $TEST_PACKAGES
# These are the latest Go versions.
-
os
:
linux
-
os
:
linux
dist
:
trusty
dist
:
trusty
sudo
:
required
sudo
:
required
...
@@ -26,8 +25,20 @@ matrix:
...
@@ -26,8 +25,20 @@ matrix:
-
go run build/ci.go install
-
go run build/ci.go install
-
go run build/ci.go test -coverage $TEST_PACKAGES
-
go run build/ci.go test -coverage $TEST_PACKAGES
# These are the latest Go versions.
-
os
:
linux
dist
:
trusty
sudo
:
required
go
:
1.12.x
script
:
-
sudo modprobe fuse
-
sudo chmod 666 /dev/fuse
-
sudo chown root:$USER /etc/fuse.conf
-
go run build/ci.go install
-
go run build/ci.go test -coverage $TEST_PACKAGES
-
os
:
osx
-
os
:
osx
go
:
1.1
1
.x
go
:
1.1
2
.x
script
:
script
:
-
echo "Increase the maximum number of open file descriptors on macOS"
-
echo "Increase the maximum number of open file descriptors on macOS"
-
NOFILE=20480
-
NOFILE=20480
...
@@ -44,7 +55,7 @@ matrix:
...
@@ -44,7 +55,7 @@ matrix:
# This builder only tests code linters on latest version of Go
# This builder only tests code linters on latest version of Go
-
os
:
linux
-
os
:
linux
dist
:
trusty
dist
:
trusty
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
env
:
-
lint
-
lint
git
:
git
:
...
@@ -56,7 +67,7 @@ matrix:
...
@@ -56,7 +67,7 @@ matrix:
-
if
:
repo = ethereum/go-ethereum AND type = push
-
if
:
repo = ethereum/go-ethereum AND type = push
os
:
linux
os
:
linux
dist
:
trusty
dist
:
trusty
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
env
:
-
ubuntu-ppa
-
ubuntu-ppa
git
:
git
:
...
@@ -79,7 +90,7 @@ matrix:
...
@@ -79,7 +90,7 @@ matrix:
os
:
linux
os
:
linux
dist
:
trusty
dist
:
trusty
sudo
:
required
sudo
:
required
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
env
:
-
azure-linux
-
azure-linux
git
:
git
:
...
@@ -114,7 +125,7 @@ matrix:
...
@@ -114,7 +125,7 @@ matrix:
dist
:
trusty
dist
:
trusty
services
:
services
:
-
docker
-
docker
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
env
:
-
azure-linux-mips
-
azure-linux-mips
git
:
git
:
...
@@ -159,7 +170,7 @@ matrix:
...
@@ -159,7 +170,7 @@ matrix:
git
:
git
:
submodules
:
false
# avoid cloning ethereum/tests
submodules
:
false
# avoid cloning ethereum/tests
before_install
:
before_install
:
-
curl https://
storage.googleapis.com/golang/go1.11.5
.linux-amd64.tar.gz | tar -xz
-
curl https://
dl.google.com/go/go1.12
.linux-amd64.tar.gz | tar -xz
-
export PATH=`pwd`/go/bin:$PATH
-
export PATH=`pwd`/go/bin:$PATH
-
export GOROOT=`pwd`/go
-
export GOROOT=`pwd`/go
-
export GOPATH=$HOME/go
-
export GOPATH=$HOME/go
...
@@ -176,7 +187,7 @@ matrix:
...
@@ -176,7 +187,7 @@ matrix:
# This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
# This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
-
if
:
repo = ethereum/go-ethereum AND type = push
-
if
:
repo = ethereum/go-ethereum AND type = push
os
:
osx
os
:
osx
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
env
:
-
azure-osx
-
azure-osx
-
azure-ios
-
azure-ios
...
@@ -206,7 +217,7 @@ matrix:
...
@@ -206,7 +217,7 @@ matrix:
-
if
:
repo = ethereum/go-ethereum AND type = cron
-
if
:
repo = ethereum/go-ethereum AND type = cron
os
:
linux
os
:
linux
dist
:
trusty
dist
:
trusty
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
env
:
-
azure-purge
-
azure-purge
git
:
git
:
...
@@ -218,7 +229,7 @@ matrix:
...
@@ -218,7 +229,7 @@ matrix:
if
:
repo = ethersphere/go-ethereum
if
:
repo = ethersphere/go-ethereum
os
:
linux
os
:
linux
dist
:
trusty
dist
:
trusty
go
:
1.1
1
.x
go
:
1.1
2
.x
git
:
git
:
submodules
:
false
# avoid cloning ethereum/tests
submodules
:
false
# avoid cloning ethereum/tests
script
:
./build/travis_keepalive.sh go test -v -timeout 20m -race ./swarm...
script
:
./build/travis_keepalive.sh go test -v -timeout 20m -race ./swarm...
Dockerfile
View file @
e43bc362
# Build Geth in a stock Go builder container
# Build Geth in a stock Go builder container
FROM
golang:1.1
1
-alpine as builder
FROM
golang:1.1
2
-alpine as builder
RUN
apk add
--no-cache
make gcc musl-dev linux-headers
RUN
apk add
--no-cache
make gcc musl-dev linux-headers
...
...
Dockerfile.alltools
View file @
e43bc362
# Build Geth in a stock Go builder container
# Build Geth in a stock Go builder container
FROM golang:1.1
1
-alpine as builder
FROM golang:1.1
2
-alpine as builder
RUN apk add --no-cache make gcc musl-dev linux-headers
RUN apk add --no-cache make gcc musl-dev linux-headers
...
...
appveyor.yml
View file @
e43bc362
...
@@ -23,8 +23,8 @@ environment:
...
@@ -23,8 +23,8 @@ environment:
install
:
install
:
-
git submodule update --init
-
git submodule update --init
-
rmdir C:\go /s /q
-
rmdir C:\go /s /q
-
appveyor DownloadFile https://
storage.googleapis.com/golang/go1.11.5
.windows-%GETH_ARCH%.zip
-
appveyor DownloadFile https://
dl.google.com/go/go1.12
.windows-%GETH_ARCH%.zip
-
7z x go1.1
1.5
.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
-
7z x go1.1
2
.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
-
go version
-
go version
-
gcc --version
-
gcc --version
...
...
core/tx_pool_test.go
View file @
e43bc362
...
@@ -126,7 +126,7 @@ func validateEvents(events chan NewTxsEvent, count int) error {
...
@@ -126,7 +126,7 @@ func validateEvents(events chan NewTxsEvent, count int) error {
case
ev
:=
<-
events
:
case
ev
:=
<-
events
:
received
=
append
(
received
,
ev
.
Txs
...
)
received
=
append
(
received
,
ev
.
Txs
...
)
case
<-
time
.
After
(
time
.
Second
)
:
case
<-
time
.
After
(
time
.
Second
)
:
return
fmt
.
Errorf
(
"event #%d not fired"
,
received
)
return
fmt
.
Errorf
(
"event #%d not fired"
,
len
(
received
)
)
}
}
}
}
if
len
(
received
)
>
count
{
if
len
(
received
)
>
count
{
...
...
crypto/bn256/cloudflare/main_test.go
View file @
e43bc362
...
@@ -13,7 +13,7 @@ func TestRandomG2Marshal(t *testing.T) {
...
@@ -13,7 +13,7 @@ func TestRandomG2Marshal(t *testing.T) {
t
.
Error
(
err
)
t
.
Error
(
err
)
continue
continue
}
}
t
.
Logf
(
"%
d
: %x
\n
"
,
n
,
g2
.
Marshal
())
t
.
Logf
(
"%
v
: %x
\n
"
,
n
,
g2
.
Marshal
())
}
}
}
}
...
...
crypto/bn256/google/main_test.go
View file @
e43bc362
...
@@ -13,7 +13,7 @@ func TestRandomG2Marshal(t *testing.T) {
...
@@ -13,7 +13,7 @@ func TestRandomG2Marshal(t *testing.T) {
t
.
Error
(
err
)
t
.
Error
(
err
)
continue
continue
}
}
t
.
Logf
(
"%
d
: %x
\n
"
,
n
,
g2
.
Marshal
())
t
.
Logf
(
"%
v
: %x
\n
"
,
n
,
g2
.
Marshal
())
}
}
}
}
...
...
internal/build/util.go
View file @
e43bc362
...
@@ -143,9 +143,9 @@ func CopyFile(dst, src string, mode os.FileMode) {
...
@@ -143,9 +143,9 @@ func CopyFile(dst, src string, mode os.FileMode) {
// so that go commands executed by build use the same version of Go as the 'host' that runs
// so that go commands executed by build use the same version of Go as the 'host' that runs
// build code. e.g.
// build code. e.g.
//
//
// /usr/lib/go-1.1
1
/bin/go run build/ci.go ...
// /usr/lib/go-1.1
2
/bin/go run build/ci.go ...
//
//
// runs using go 1.1
1 and invokes go 1.11
tools from the same GOROOT. This is also important
// runs using go 1.1
2 and invokes go 1.12
tools from the same GOROOT. This is also important
// because runtime.Version checks on the host should match the tools that are run.
// because runtime.Version checks on the host should match the tools that are run.
func
GoTool
(
tool
string
,
args
...
string
)
*
exec
.
Cmd
{
func
GoTool
(
tool
string
,
args
...
string
)
*
exec
.
Cmd
{
args
=
append
([]
string
{
tool
},
args
...
)
args
=
append
([]
string
{
tool
},
args
...
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment