Skip to content

Commit

Permalink
ci: Update travis/appveyor to go 1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
nielsAD committed Mar 17, 2019
1 parent 0682ec6 commit 7152d06
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@
# License: Mozilla Public License, v2.0

language: go
go: 1.11.x
go: 1.12.x

os:
- linux
- osx

dist: xenial

notifications:
email:
on_success: false
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ apt-get install --no-install-recommends -y build-essential cmake git golang-go l
brew install cmake git go gmp bzip2 zlib libpcap

# Windows dependencies (use MSYS2 -- https://www.msys2.org/)
# Install WinPcap in C:\WinPcap (https://www.winpcap.org/devel.htm)
pacman --needed --noconfirm -S git mingw-w64-x86_64-toolchain mingw-w64-x86_64-go mingw-w64-x86_64-cmake

# Download vendor submodules
Expand Down
5 changes: 1 addition & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ environment:
MSYSTEM: MINGW64
MSYS2_ARCH: x86_64

stack: go 1.11
stack: go 1.12

init:
- git config --global core.autocrlf true
Expand All @@ -37,9 +37,6 @@ install:
- bash -lc "pacman --needed --noconfirm -Syu" # out-of-date packages
- bash -lc "pacman --needed --noconfirm -S mingw-w64-$MSYS2_ARCH-toolchain mingw-w64-$MSYS2_ARCH-cmake"

- ps: Start-FileDownload 'https://github.com/nielsAD/gowarcraft3/files/2175629/WpdPack_4_1_2.zip'
- 7z x WpdPack_4_1_2.zip -oC:\

# Install test dependencies
- go get golang.org/x/lint/golint

Expand Down
5 changes: 3 additions & 2 deletions network/peer/host_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ func closeAll(hosts []*peer.Host) {
var n = len(hosts)
for i := 0; i < n; i++ {
hosts[i].Close()
hosts[i].Wait()
}
}

Expand Down Expand Up @@ -211,7 +212,7 @@ func TestMass(t *testing.T) {
}

// Wait for chat
for try := 0; try < 100 && atomic.LoadInt32(&chat) != int32(len(hosts)-1); try++ {
for try := 0; try < 300 && atomic.LoadInt32(&chat) != int32(len(hosts)-1); try++ {
time.Sleep(50 * time.Millisecond)
}

Expand All @@ -228,7 +229,7 @@ func TestMass(t *testing.T) {
}

// Wait for chat
for try := 0; try < 100 && atomic.LoadInt32(&chat) != int32(len(hosts)-2); try++ {
for try := 0; try < 300 && atomic.LoadInt32(&chat) != int32(len(hosts)-2); try++ {
time.Sleep(50 * time.Millisecond)
}

Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/google/gopacket
Submodule gopacket updated 186 files

0 comments on commit 7152d06

Please sign in to comment.