travis: fix Go Modules build problems
This commit is contained in:
parent
a7d562d114
commit
73436d9419
@ -1,9 +1,13 @@
|
|||||||
language: go
|
language: go
|
||||||
|
os: linux
|
||||||
|
|
||||||
# fuse on travis
|
# fuse on travis
|
||||||
sudo: required
|
sudo: required
|
||||||
dist: bionic # Ubuntu 18.04 "Bionic", https://docs.travis-ci.com/user/reference/bionic/
|
dist: bionic # Ubuntu 18.04 "Bionic", https://docs.travis-ci.com/user/reference/bionic/
|
||||||
|
|
||||||
|
env:
|
||||||
|
- GO111MODULE=on
|
||||||
|
|
||||||
git:
|
git:
|
||||||
depth: 300
|
depth: 300
|
||||||
|
|
||||||
@ -27,7 +31,7 @@ before_install:
|
|||||||
script:
|
script:
|
||||||
- openssl version
|
- openssl version
|
||||||
- df -Th / /tmp
|
- df -Th / /tmp
|
||||||
- go build
|
- env GO111MODULE=on go build
|
||||||
- ./build-without-openssl.bash
|
- ./build-without-openssl.bash
|
||||||
- ./build.bash
|
- ./build.bash
|
||||||
- ./gocryptfs -speed
|
- ./gocryptfs -speed
|
||||||
|
@ -15,7 +15,7 @@ cd "$(dirname "$0")"
|
|||||||
# 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
|
# Enable Go Modules 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
|
# 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
|
export GO111MODULE=on
|
||||||
|
|
||||||
@ -68,7 +68,12 @@ fi
|
|||||||
# Also, Fedora and Arch want pie enabled, so enable it.
|
# Also, Fedora and Arch want pie enabled, so enable it.
|
||||||
# * https://fedoraproject.org/wiki/Changes/golang-buildmode-pie
|
# * https://fedoraproject.org/wiki/Changes/golang-buildmode-pie
|
||||||
# * https://github.com/rfjakob/gocryptfs/pull/460
|
# * https://github.com/rfjakob/gocryptfs/pull/460
|
||||||
export GOFLAGS="${GOFLAGS:--trimpath -buildmode=pie}"
|
# However, -trimpath needs Go 1.13+, and we support Go 1.11 and Go 1.12
|
||||||
|
# too. So don't add it there.
|
||||||
|
GV=$(go version)
|
||||||
|
if [[ $GV != *"1.11"* && $GV != *"1.12"* ]] ; then
|
||||||
|
export GOFLAGS="${GOFLAGS:--trimpath -buildmode=pie}"
|
||||||
|
fi
|
||||||
|
|
||||||
GO_LDFLAGS="-X main.GitVersion=$GITVERSION -X main.GitVersionFuse=$GITVERSIONFUSE -X main.BuildDate=$BUILDDATE"
|
GO_LDFLAGS="-X main.GitVersion=$GITVERSION -X main.GitVersionFuse=$GITVERSIONFUSE -X main.BuildDate=$BUILDDATE"
|
||||||
|
|
||||||
|
@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
|
export GO111MODULE=on
|
||||||
B="go build -tags without_openssl"
|
B="go build -tags without_openssl"
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
# See https://github.com/golang/go/wiki/GoArm
|
# See https://github.com/golang/go/wiki/GoArm
|
||||||
GOOS=linux GOARCH=arm GOARM=7 $B
|
GOOS=linux GOARCH=arm GOARM=7 $B
|
||||||
GOOS=linux GOARCH=arm64 $B
|
GOOS=linux GOARCH=arm64 $B
|
||||||
|
|
||||||
# MacOS
|
# MacOS
|
||||||
GOOS=darwin GOARCH=amd64 $B
|
GOOS=darwin GOARCH=amd64 $B
|
||||||
|
Loading…
Reference in New Issue
Block a user