Skip to content

Commit efb94c8

Browse files
authored
Fixes linux test in travis (#3115)
1 parent 87bfe72 commit efb94c8

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,19 @@ matrix:
1717

1818
os:
1919
- osx
20+
- linux
2021

2122
before_install:
2223
# Call xvfb directly on linux runs and give it time to start
2324
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then
2425
export DISPLAY=:99.0;
25-
Xvfb :99 &
26+
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
2627
sleep 3;
2728
sudo apt-get update && sudo apt-get install -y libsecret-1-0;
2829
fi
2930

3031
install:
31-
- TRAVIS_NODE_VERSION="6";
32+
- TRAVIS_NODE_VERSION="8";
3233
# Clear out whatever version of NVM Travis has as it is old.
3334
- rm -rf ~/.nvm;
3435
# Grab NVM.
@@ -49,7 +50,7 @@ install:
4950
- go get -u -v github.com/ramya-rao-a/go-outline
5051
- go get -u -v github.com/rogpeppe/godef
5152
- go get -u -v github.com/sqs/goreturns
52-
- go get -u -v github.com/uudashr/gopkgs/cmd/gopkgs
53+
- go get -u -v github.com/uudashr/gopkgs/v2/cmd/gopkgs
5354
- go get -u -v github.com/zmb3/gogetdoc
5455
- go get -u -v golang.org/x/lint/golint
5556
- go get -u -v golang.org/x/tools/cmd/gorename

build/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:latest AS gobuilder
1+
FROM golang:1.14 AS gobuilder
22

33
ENV GO111MODULE on
44
ENV GOBIN /gobin
@@ -29,7 +29,7 @@ RUN go get -u -v \
2929
github.com/ramya-rao-a/go-outline \
3030
github.com/rogpeppe/godef \
3131
github.com/sqs/goreturns \
32-
github.com/uudashr/gopkgs/cmd/gopkgs \
32+
github.com/uudashr/gopkgs/v2/cmd/gopkgs \
3333
github.com/zmb3/gogetdoc \
3434
golang.org/x/lint/golint \
3535
golang.org/x/tools/cmd/gorename

0 commit comments

Comments
 (0)