Skip to content

Commit 91c890b

Browse files
author
Dmitry Rozhkov
committed
ci: adapt to go mod
switch go mod on explicitly in CI travisci: enable caching of Go modules travisci: drop obsolete hack
1 parent 097ce82 commit 91c890b

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ dist: xenial
55
go:
66
- 1.12.x
77

8+
cache:
9+
directories:
10+
- $GOPATH/pkg/mod
11+
812
env:
913
global:
1014
- RUNC_VERSION=v1.0.0-rc8
1115
- CRIO_VERSION=v1.14.6
1216
- BUILDAH_VERSION=v1.10.0
17+
- GO111MODULE=on
1318

1419
sudo: required
1520

@@ -18,9 +23,6 @@ before_install:
1823
- go get -v golang.org/x/lint/golint
1924
- go get -v github.com/fzipp/gocyclo
2025
- go get -v golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow
21-
## hack for building on forks
22-
- repo=`basename $PWD`; src=`dirname $PWD`; dest="`dirname $src`/intel"
23-
- if [[ "$src" != "$dest" ]]; then mv "$src" "$dest"; cd ../../intel/$repo; export TRAVIS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/$repo; fi
2426
## install buildah build deps
2527
- cdir=$(pwd)
2628
- sudo apt-get update

Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ pipeline {
66
timeout(time: 2, unit: "HOURS")
77
}
88
environment {
9+
GO111MODULE="on"
910
RUNC_VERSION="v1.0.0-rc8"
1011
CRIO_VERSION="v1.14.6"
1112
BUILDAH_VERSION="v1.10.0"
12-
GO_VERSION="1.12.8"
13+
GO_VERSION="1.12.9"
1314
GO_TAR="go${GO_VERSION}.linux-amd64.tar.gz"
1415
GOROOT="/usr/local/go"
1516
GOPATH="/tmp/go"

0 commit comments

Comments
 (0)