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
505a49e6
Unverified
Commit
505a49e6
authored
Feb 27, 2019
by
Péter Szilágyi
Committed by
GitHub
Feb 27, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #19166 from SamuelMarks/go-1.12
Upgrade to Go 1.12
parents
7ebd2fa5
2b6158a5
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
103 additions
and
20 deletions
+103
-20
.travis.yml
.travis.yml
+21
-10
Dockerfile
Dockerfile
+1
-1
Dockerfile.alltools
Dockerfile.alltools
+1
-1
appveyor.yml
appveyor.yml
+2
-2
fdlimit_darwin.go
common/fdlimit/fdlimit_darwin.go
+71
-0
fdlimit_unix.go
common/fdlimit/fdlimit_unix.go
+1
-1
fdlimit_windows.go
common/fdlimit/fdlimit_windows.go
+1
-0
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 @
505a49e6
...
...
@@ -14,7 +14,6 @@ matrix:
-
go run build/ci.go install
-
go run build/ci.go test -coverage $TEST_PACKAGES
# These are the latest Go versions.
-
os
:
linux
dist
:
trusty
sudo
:
required
...
...
@@ -26,8 +25,20 @@ matrix:
-
go run build/ci.go install
-
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
go
:
1.1
1
.x
go
:
1.1
2
.x
script
:
-
echo "Increase the maximum number of open file descriptors on macOS"
-
NOFILE=20480
...
...
@@ -44,7 +55,7 @@ matrix:
# This builder only tests code linters on latest version of Go
-
os
:
linux
dist
:
trusty
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
-
lint
git
:
...
...
@@ -56,7 +67,7 @@ matrix:
-
if
:
repo = ethereum/go-ethereum AND type = push
os
:
linux
dist
:
trusty
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
-
ubuntu-ppa
git
:
...
...
@@ -79,7 +90,7 @@ matrix:
os
:
linux
dist
:
trusty
sudo
:
required
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
-
azure-linux
git
:
...
...
@@ -114,7 +125,7 @@ matrix:
dist
:
trusty
services
:
-
docker
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
-
azure-linux-mips
git
:
...
...
@@ -159,7 +170,7 @@ matrix:
git
:
submodules
:
false
# avoid cloning ethereum/tests
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 GOROOT=`pwd`/go
-
export GOPATH=$HOME/go
...
...
@@ -176,7 +187,7 @@ matrix:
# This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
-
if
:
repo = ethereum/go-ethereum AND type = push
os
:
osx
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
-
azure-osx
-
azure-ios
...
...
@@ -206,7 +217,7 @@ matrix:
-
if
:
repo = ethereum/go-ethereum AND type = cron
os
:
linux
dist
:
trusty
go
:
1.1
1
.x
go
:
1.1
2
.x
env
:
-
azure-purge
git
:
...
...
@@ -218,7 +229,7 @@ matrix:
if
:
repo = ethersphere/go-ethereum
os
:
linux
dist
:
trusty
go
:
1.1
1
.x
go
:
1.1
2
.x
git
:
submodules
:
false
# avoid cloning ethereum/tests
script
:
./build/travis_keepalive.sh go test -v -timeout 20m -race ./swarm...
Dockerfile
View file @
505a49e6
# 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
...
...
Dockerfile.alltools
View file @
505a49e6
# 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
...
...
appveyor.yml
View file @
505a49e6
...
...
@@ -23,8 +23,8 @@ environment:
install
:
-
git submodule update --init
-
rmdir C:\go /s /q
-
appveyor DownloadFile https://
storage.googleapis.com/golang/go1.11.5
.windows-%GETH_ARCH%.zip
-
7z x go1.1
1.5
.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
-
appveyor DownloadFile https://
dl.google.com/go/go1.12
.windows-%GETH_ARCH%.zip
-
7z x go1.1
2
.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
-
go version
-
gcc --version
...
...
common/fdlimit/fdlimit_darwin.go
0 → 100644
View file @
505a49e6
// Copyright 2019 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// The go-ethereum library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
package
fdlimit
import
"syscall"
// hardlimit is the number of file descriptors allowed at max by the kernel.
const
hardlimit
=
10240
// Raise tries to maximize the file descriptor allowance of this process
// to the maximum hard-limit allowed by the OS.
// Returns the size it was set to (may differ from the desired 'max')
func
Raise
(
max
uint64
)
(
uint64
,
error
)
{
// Get the current limit
var
limit
syscall
.
Rlimit
if
err
:=
syscall
.
Getrlimit
(
syscall
.
RLIMIT_NOFILE
,
&
limit
);
err
!=
nil
{
return
0
,
err
}
// Try to update the limit to the max allowance
limit
.
Cur
=
limit
.
Max
if
limit
.
Cur
>
max
{
limit
.
Cur
=
max
}
if
err
:=
syscall
.
Setrlimit
(
syscall
.
RLIMIT_NOFILE
,
&
limit
);
err
!=
nil
{
return
0
,
err
}
// MacOS can silently apply further caps, so retrieve the actually set limit
if
err
:=
syscall
.
Getrlimit
(
syscall
.
RLIMIT_NOFILE
,
&
limit
);
err
!=
nil
{
return
0
,
err
}
return
limit
.
Cur
,
nil
}
// Current retrieves the number of file descriptors allowed to be opened by this
// process.
func
Current
()
(
int
,
error
)
{
var
limit
syscall
.
Rlimit
if
err
:=
syscall
.
Getrlimit
(
syscall
.
RLIMIT_NOFILE
,
&
limit
);
err
!=
nil
{
return
0
,
err
}
return
int
(
limit
.
Cur
),
nil
}
// Maximum retrieves the maximum number of file descriptors this process is
// allowed to request for itself.
func
Maximum
()
(
int
,
error
)
{
// Retrieve the maximum allowed by dynamic OS limits
var
limit
syscall
.
Rlimit
if
err
:=
syscall
.
Getrlimit
(
syscall
.
RLIMIT_NOFILE
,
&
limit
);
err
!=
nil
{
return
0
,
err
}
// Cap it to OPEN_MAX (10240) because macos is a special snowflake
if
limit
.
Max
>
hardlimit
{
limit
.
Max
=
hardlimit
}
return
int
(
limit
.
Max
),
nil
}
common/fdlimit/fdlimit_unix.go
View file @
505a49e6
...
...
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
// +build linux
darwin
netbsd openbsd solaris
// +build linux netbsd openbsd solaris
package
fdlimit
...
...
common/fdlimit/fdlimit_windows.go
View file @
505a49e6
...
...
@@ -18,6 +18,7 @@ package fdlimit
import
"fmt"
// hardlimit is the number of file descriptors allowed at max by the kernel.
const
hardlimit
=
16384
// Raise tries to maximize the file descriptor allowance of this process
...
...
core/tx_pool_test.go
View file @
505a49e6
...
...
@@ -126,7 +126,7 @@ func validateEvents(events chan NewTxsEvent, count int) error {
case
ev
:=
<-
events
:
received
=
append
(
received
,
ev
.
Txs
...
)
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
{
...
...
crypto/bn256/cloudflare/main_test.go
View file @
505a49e6
...
...
@@ -13,7 +13,7 @@ func TestRandomG2Marshal(t *testing.T) {
t
.
Error
(
err
)
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 @
505a49e6
...
...
@@ -13,7 +13,7 @@ func TestRandomG2Marshal(t *testing.T) {
t
.
Error
(
err
)
continue
}
t
.
Logf
(
"%
d
: %x
\n
"
,
n
,
g2
.
Marshal
())
t
.
Logf
(
"%
v
: %x
\n
"
,
n
,
g2
.
Marshal
())
}
}
...
...
internal/build/util.go
View file @
505a49e6
...
...
@@ -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
// 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.
func
GoTool
(
tool
string
,
args
...
string
)
*
exec
.
Cmd
{
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