diff options
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rwxr-xr-x | build.bash | 20 | ||||
| -rwxr-xr-x | package-source.bash | 2 | ||||
| -rwxr-xr-x | test.bash | 2 |
4 files changed, 10 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index 4c0d01f..8507326 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,11 +24,6 @@ before_install: - sudo chmod 666 /dev/fuse - sudo chown root:$USER /etc/fuse.conf -install: - - go get -d -t -v ./... - - wget https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 -O dep - - chmod +x dep - script: - openssl version - df -Th / /tmp @@ -40,7 +35,5 @@ script: - make root_test - ./crossbuild.bash - echo "rebuild with locked dependencies" - - echo travis_fold:start:dep - - ./dep ensure -v - - echo travis_fold:end:dep - - ./build.bash + - go mod vendor + - ./build.bash -mod=vendor @@ -11,21 +11,17 @@ # . cd "$(dirname "$0")" -MYDIR=$PWD # Make sure we have the go binary go version > /dev/null +# Make it work on Go 1.11 and 1.12 +# https://dev.to/maelvls/why-is-go111module-everywhere-and-everything-about-go-modules-24k#-raw-go111module-endraw-with-go-111-and-112 +export GO111MODULE=on + # GOPATH may contain multiple paths separated by ":" GOPATH1=$(go env GOPATH | cut -f1 -d:) -if [[ $PWD != *"/src/github.com/rfjakob/gocryptfs" ]] ; then - echo "Warning: Building outside of GOPATH will most likely fail." - echo " Please rename $PWD to $GOPATH1/src/github.com/rfjakob/gocryptfs ." - sleep 5 - echo -fi - # gocryptfs version according to git or a VERSION file if [[ -d .git ]] ; then GITVERSION=$(git describe --tags --dirty) @@ -44,19 +40,15 @@ fi if [[ -d vendor/github.com/hanwen/go-fuse ]] ; then GITVERSIONFUSE="[vendored]" else - # go-fuse version according to git - # Note: git in CentOS 7 does not have "git -C" yet, so we use plain "cd". + # go-fuse version according to Go Modules FAIL=0 - cd "$GOPATH1/src/github.com/hanwen/go-fuse" - OUT=$(git describe --tags --dirty 2>&1) || FAIL=1 + OUT=$(go list -m github.com/hanwen/go-fuse | cut -d' ' -f2) || FAIL=1 if [[ $FAIL -eq 0 ]]; then GITVERSIONFUSE=$OUT else - echo "$PWD: git describe: $OUT" echo "Warning: could not determine go-fuse version" GITVERSIONFUSE="[unknown]" fi - cd "$MYDIR" fi # Build date, something like "2017-09-06". Don't override BUILDDATE diff --git a/package-source.bash b/package-source.bash index 4d0c24d..cdd9923 100755 --- a/package-source.bash +++ b/package-source.bash @@ -27,7 +27,7 @@ PREFIX_SRC_ONLY=gocryptfs_${GITVERSION}_src git_archive_extra "$PREFIX_SRC_ONLY" VERSION Documentation/*.1 # gocryptfs source + dependencies tarball -dep ensure +go mod vendor PREFIX_SRC_DEPS=gocryptfs_${GITVERSION}_src-deps git_archive_extra "$PREFIX_SRC_DEPS" VERSION Documentation/*.1 vendor @@ -61,7 +61,7 @@ fi # We don't want all the subprocesses # holding the lock file open -# vvvvv +# vvvvv go test -count 1 ./... "$@" 200>&- # ^^^^^^^^ # Disable result caching |