Skip to content

Commit 13773f4

Browse files
committed
test.bash, crossbuild.bash: drop old Go version kludges
GO111MODULE is default on with Go 1.16, same version that gained darwin/arm64 support. We only support Go 1.19 and up, so drop the kludges.
1 parent 50eb371 commit 13773f4

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

crossbuild.bash

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ function compile_tests {
1515

1616
set -eux
1717

18-
export GO111MODULE=on
1918
export CGO_ENABLED=0
2019

2120
GOOS=linux GOARCH=amd64 build
@@ -30,8 +29,4 @@ GOOS=darwin GOARCH=amd64 build
3029
time GOOS=darwin GOARCH=amd64 compile_tests
3130

3231
# MacOS on Apple Silicon M1.
33-
# Go 1.16 added support for the M1 and added ios/arm64,
34-
# so we use this to check if we should attempt a build.
35-
if go tool dist list | grep ios/arm64 ; then
36-
GOOS=darwin GOARCH=arm64 build
37-
fi
32+
GOOS=darwin GOARCH=arm64 build

test.bash

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ else
2222
fi
2323

2424
cd "$(dirname "$0")"
25-
export GO111MODULE=on
2625
MYNAME=$(basename "$0")
2726
TESTDIR=$TMPDIR/gocryptfs-test-parent-$UID
2827
mkdir -p "$TESTDIR"

0 commit comments

Comments
 (0)