Convert build and packaging scripts to Go Modules
This commit is contained in:
parent
cad711993d
commit
e509b27a5c
11
.travis.yml
11
.travis.yml
@ -24,11 +24,6 @@ before_install:
|
|||||||
- sudo chmod 666 /dev/fuse
|
- sudo chmod 666 /dev/fuse
|
||||||
- sudo chown root:$USER /etc/fuse.conf
|
- 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:
|
script:
|
||||||
- openssl version
|
- openssl version
|
||||||
- df -Th / /tmp
|
- df -Th / /tmp
|
||||||
@ -40,7 +35,5 @@ script:
|
|||||||
- make root_test
|
- make root_test
|
||||||
- ./crossbuild.bash
|
- ./crossbuild.bash
|
||||||
- echo "rebuild with locked dependencies"
|
- echo "rebuild with locked dependencies"
|
||||||
- echo travis_fold:start:dep
|
- go mod vendor
|
||||||
- ./dep ensure -v
|
- ./build.bash -mod=vendor
|
||||||
- echo travis_fold:end:dep
|
|
||||||
- ./build.bash
|
|
||||||
|
20
build.bash
20
build.bash
@ -11,21 +11,17 @@
|
|||||||
# .
|
# .
|
||||||
|
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
MYDIR=$PWD
|
|
||||||
|
|
||||||
# Make sure we have the go binary
|
# Make sure we have the go binary
|
||||||
go version > /dev/null
|
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 ":"
|
# GOPATH may contain multiple paths separated by ":"
|
||||||
GOPATH1=$(go env GOPATH | cut -f1 -d:)
|
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
|
# gocryptfs version according to git or a VERSION file
|
||||||
if [[ -d .git ]] ; then
|
if [[ -d .git ]] ; then
|
||||||
GITVERSION=$(git describe --tags --dirty)
|
GITVERSION=$(git describe --tags --dirty)
|
||||||
@ -44,19 +40,15 @@ fi
|
|||||||
if [[ -d vendor/github.com/hanwen/go-fuse ]] ; then
|
if [[ -d vendor/github.com/hanwen/go-fuse ]] ; then
|
||||||
GITVERSIONFUSE="[vendored]"
|
GITVERSIONFUSE="[vendored]"
|
||||||
else
|
else
|
||||||
# go-fuse version according to git
|
# go-fuse version according to Go Modules
|
||||||
# Note: git in CentOS 7 does not have "git -C" yet, so we use plain "cd".
|
|
||||||
FAIL=0
|
FAIL=0
|
||||||
cd "$GOPATH1/src/github.com/hanwen/go-fuse"
|
OUT=$(go list -m github.com/hanwen/go-fuse | cut -d' ' -f2) || FAIL=1
|
||||||
OUT=$(git describe --tags --dirty 2>&1) || FAIL=1
|
|
||||||
if [[ $FAIL -eq 0 ]]; then
|
if [[ $FAIL -eq 0 ]]; then
|
||||||
GITVERSIONFUSE=$OUT
|
GITVERSIONFUSE=$OUT
|
||||||
else
|
else
|
||||||
echo "$PWD: git describe: $OUT"
|
|
||||||
echo "Warning: could not determine go-fuse version"
|
echo "Warning: could not determine go-fuse version"
|
||||||
GITVERSIONFUSE="[unknown]"
|
GITVERSIONFUSE="[unknown]"
|
||||||
fi
|
fi
|
||||||
cd "$MYDIR"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Build date, something like "2017-09-06". Don't override BUILDDATE
|
# Build date, something like "2017-09-06". Don't override BUILDDATE
|
||||||
|
@ -27,7 +27,7 @@ PREFIX_SRC_ONLY=gocryptfs_${GITVERSION}_src
|
|||||||
git_archive_extra "$PREFIX_SRC_ONLY" VERSION Documentation/*.1
|
git_archive_extra "$PREFIX_SRC_ONLY" VERSION Documentation/*.1
|
||||||
|
|
||||||
# gocryptfs source + dependencies tarball
|
# gocryptfs source + dependencies tarball
|
||||||
dep ensure
|
go mod vendor
|
||||||
PREFIX_SRC_DEPS=gocryptfs_${GITVERSION}_src-deps
|
PREFIX_SRC_DEPS=gocryptfs_${GITVERSION}_src-deps
|
||||||
git_archive_extra "$PREFIX_SRC_DEPS" VERSION Documentation/*.1 vendor
|
git_archive_extra "$PREFIX_SRC_DEPS" VERSION Documentation/*.1 vendor
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user