Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
p2p
go-p2p-swarm
Commits
6b6e765b
Unverified
Commit
6b6e765b
authored
Apr 30, 2021
by
web3-bot
Committed by
GitHub
Apr 30, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sync: update CI config files (#248)
parent
b80b91c8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
117 additions
and
38 deletions
+117
-38
.github/workflows/automerge.yml
.github/workflows/automerge.yml
+27
-0
.github/workflows/go-check.yml
.github/workflows/go-check.yml
+40
-0
.github/workflows/go-test.yml
.github/workflows/go-test.yml
+38
-0
.travis.yml
.travis.yml
+0
-30
swarm_net_test.go
swarm_net_test.go
+12
-8
No files found.
.github/workflows/automerge.yml
0 → 100644
View file @
6b6e765b
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.
# Automatically merge pull requests opened by web3-bot, as soon as (and only if) all tests pass.
# This reduces the friction associated with updating with our workflows.
on
:
[
pull_request
]
jobs
:
automerge
:
if
:
github.event.pull_request.user.login == 'web3-bot'
runs-on
:
ubuntu-latest
steps
:
-
name
:
Wait on tests
uses
:
lewagon/wait-on-check-action@bafe56a6863672c681c3cf671f5e10b20abf2eaa
# v0.2
with
:
ref
:
${{ github.event.pull_request.head.sha }}
repo-token
:
${{ secrets.GITHUB_TOKEN }}
wait-interval
:
10
running-workflow-name
:
'
automerge'
# the name of this job
-
name
:
Merge PR
uses
:
pascalgn/automerge-action@741c311a47881be9625932b0a0de1b0937aab1ae
# v0.13.1
env
:
GITHUB_TOKEN
:
"
${{
secrets.GITHUB_TOKEN
}}"
MERGE_LABELS
:
"
"
MERGE_METHOD
:
"
squash"
MERGE_DELETE_BRANCH
:
true
.github/workflows/go-check.yml
0 → 100644
View file @
6b6e765b
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.
on
:
[
push
,
pull_request
]
jobs
:
unit
:
runs-on
:
ubuntu-latest
name
:
Go checks
steps
:
-
uses
:
actions/checkout@v2
-
uses
:
actions/setup-go@v2
with
:
go-version
:
"
1.16.x"
-
name
:
Install staticcheck
run
:
go install honnef.co/go/tools/cmd/staticcheck@be534f007836a777104a15f2456cd1fffd3ddee8
# v2020.2.2
-
name
:
Check that go.mod is tidy
run
:
|
cp go.mod go.mod.orig
cp go.sum go.sum.orig
go mod tidy
diff go.mod go.mod.orig
diff go.sum go.sum.orig
-
name
:
gofmt
if
:
${{ success() || failure() }}
# run this step even if the previous one failed
run
:
|
out=$(gofmt -s -l .)
if [[ -n "$out" ]]; then
echo $out | awk '{print "::error file=" $0 ",line=0,col=0::File is not gofmt-ed."}'
exit 1
fi
-
name
:
go vet
if
:
${{ success() || failure() }}
# run this step even if the previous one failed
run
:
go vet ./...
-
name
:
staticcheck
if
:
${{ success() || failure() }}
# run this step even if the previous one failed
run
:
|
set -o pipefail
staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g'
.github/workflows/go-test.yml
0 → 100644
View file @
6b6e765b
# File managed by web3-bot. DO NOT EDIT.
# See https://github.com/protocol/.github/ for details.
on
:
[
push
,
pull_request
]
jobs
:
unit
:
strategy
:
fail-fast
:
false
matrix
:
os
:
[
"
ubuntu"
,
"
windows"
,
"
macos"
]
go
:
[
"
1.15.x"
,
"
1.16.x"
]
runs-on
:
${{ matrix.os }}-latest
name
:
Unit tests (${{ matrix.os}}, Go ${{ matrix.go }})
steps
:
-
uses
:
actions/checkout@v2
-
uses
:
actions/setup-go@v2
with
:
go-version
:
${{ matrix.go }}
-
name
:
Go information
run
:
|
go version
go env
-
name
:
Run tests
run
:
go test -v -coverprofile coverage.txt ./...
-
name
:
Run tests (32 bit)
if
:
${{ matrix.os != 'macos' }}
# can't run 32 bit tests on OSX.
env
:
GOARCH
:
386
run
:
go test -v ./...
-
name
:
Run tests with race detector
if
:
${{ matrix.os == 'ubuntu' }}
# speed things up. Windows and OSX VMs are slow
run
:
go test -v -race ./...
-
name
:
Upload coverage to Codecov
uses
:
codecov/codecov-action@fcebab03f26c7530a22baa63f06b3e0515f0c7cd
# v1.3.1
with
:
file
:
coverage.txt
env_vars
:
OS=${{ matrix.os }}, GO=${{ matrix.go }}
.travis.yml
deleted
100644 → 0
View file @
b80b91c8
os
:
-
linux
language
:
go
go
:
-
1.14.x
env
:
global
:
-
GOTFLAGS="-race"
matrix
:
-
BUILD_DEPTYPE=gomod
# disable travis install
install
:
-
true
script
:
-
bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh)
cache
:
directories
:
-
$GOPATH/pkg/mod
-
$HOME/.cache/go-build
notifications
:
email
:
false
swarm_net_test.go
View file @
6b6e765b
...
@@ -3,6 +3,7 @@ package swarm_test
...
@@ -3,6 +3,7 @@ package swarm_test
import
(
import
(
"context"
"context"
"fmt"
"fmt"
"io/ioutil"
"testing"
"testing"
"time"
"time"
...
@@ -108,6 +109,8 @@ func TestNetworkOpenStream(t *testing.T) {
...
@@ -108,6 +109,8 @@ func TestNetworkOpenStream(t *testing.T) {
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
defer
cancel
()
testString
:=
"hello ipfs"
nets
:=
make
([]
network
.
Network
,
4
)
nets
:=
make
([]
network
.
Network
,
4
)
for
i
:=
0
;
i
<
4
;
i
++
{
for
i
:=
0
;
i
<
4
;
i
++
{
nets
[
i
]
=
GenSwarm
(
t
,
ctx
)
nets
[
i
]
=
GenSwarm
(
t
,
ctx
)
...
@@ -129,13 +132,12 @@ func TestNetworkOpenStream(t *testing.T) {
...
@@ -129,13 +132,12 @@ func TestNetworkOpenStream(t *testing.T) {
defer
close
(
done
)
defer
close
(
done
)
defer
s
.
Close
()
defer
s
.
Close
()
buf
:=
make
([]
byte
,
10
)
buf
,
err
:=
ioutil
.
ReadAll
(
s
)
_
,
err
:=
s
.
Read
(
buf
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Error
(
err
)
t
.
Error
(
err
)
return
return
}
}
if
string
(
buf
)
!=
"hello ipfs"
{
if
string
(
buf
)
!=
testString
{
t
.
Error
(
"got wrong message"
)
t
.
Error
(
"got wrong message"
)
}
}
})
})
...
@@ -145,18 +147,20 @@ func TestNetworkOpenStream(t *testing.T) {
...
@@ -145,18 +147,20 @@ func TestNetworkOpenStream(t *testing.T) {
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
s
treams
:=
nets
[
0
]
.
ConnsToPeer
(
nets
[
1
]
.
LocalPeer
())[
0
]
.
GetStreams
()
numS
treams
:=
0
if
err
!=
nil
{
for
_
,
conn
:=
range
nets
[
0
]
.
ConnsToPeer
(
nets
[
1
]
.
LocalPeer
())
{
t
.
Fatal
(
err
)
numStreams
+=
len
(
conn
.
GetStreams
()
)
}
}
if
len
(
s
treams
)
!=
1
{
if
numS
treams
!=
1
{
t
.
Fatal
(
"should only have one stream there"
)
t
.
Fatal
(
"should only have one stream there"
)
}
}
_
,
err
=
s
.
Write
([]
byte
(
"hello ipfs"
))
n
,
err
:
=
s
.
Write
([]
byte
(
testString
))
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
else
if
n
!=
len
(
testString
)
{
t
.
Errorf
(
"expected to write %d bytes, wrote %d"
,
len
(
testString
),
n
)
}
}
err
=
s
.
Close
()
err
=
s
.
Close
()
...
...
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