Skip to content

Commit d25c33f

Browse files
go1.16.2,go1.15.10 (#107)
Co-authored-by: techknowlogick <[email protected]>
1 parent 945a59d commit d25c33f

File tree

10 files changed

+35
-31
lines changed

10 files changed

+35
-31
lines changed

Diff for: .golang_hash

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
21096d066212c604c2b036c3541a501e82464cf7d88b8e1e186290d9af66cf50
1+
ac6e67bb769bcbd7bd7d12431dddee26130e0a14f7dcf3920cf25ae56560c6c7

Diff for: .golang_version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
go1.16.1,go1.15.9
1+
go1.16.2,go1.15.10

Diff for: docker/base/bootstrap_pure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ GOOS=windows GOARCH=386 CGO_ENABLED=1 CC=i686-w64-mingw32-gcc go install std
6060
echo "Bootstrapping darwin/amd64..."
6161
GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 CC=o64-clang go install std
6262

63-
if [ $GO_VERSION -ge 1160 ]; then
63+
if [[ "$GO_VERSION" != 115* ]]; then
6464
echo "Bootstrapping darwin/arm64..."
6565
GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 CC=o64-clang go install std
6666
fi

Diff for: docker/base/build.sh

+10-6
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ for TARGET in $TARGETS; do
396396
# Split the platform version and configure the deployment target
397397
PLATFORM=`echo $XGOOS | cut -d '-' -f 2`
398398
if [ "$PLATFORM" == "" ] || [ "$PLATFORM" == "." ] || [ "$PLATFORM" == "darwin" ]; then
399-
PLATFORM=10.6 # OS X Snow Leopard
399+
PLATFORM=10.12 # OS X Sierra (min version support for golang)
400400
fi
401401
export MACOSX_DEPLOYMENT_TARGET=$PLATFORM
402402

@@ -415,12 +415,16 @@ for TARGET in $TARGETS; do
415415
CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 go build $V $X $TP $MOD "${T[@]}" --ldflags="$LDSTRIP $V $LD" $R $BM -o "/build/$NAME-darwin-$PLATFORM-amd64$R`extension darwin`" $PACK_RELPATH
416416
fi
417417
if [ $XGOARCH == "." ] || [ $XGOARCH == "arm64" ]; then
418-
echo "Compiling for darwin-$PLATFORM/arm64..."
419-
CC=o64-clang CXX=o64-clang++ HOST=arm64-apple-darwin15 PREFIX=/usr/local $BUILD_DEPS /deps ${DEPS_ARGS[@]}
420-
if [[ "$USEMODULES" == false ]]; then
421-
CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go get $V $X "${T[@]}" --ldflags="$LDSTRIP $V $LD" -d $PACK_RELPATH
418+
if [[ "$GO_VERSION" == 115* ]]; then
419+
echo "Go version too low, skipping darwin-$PLATFORM/arm64..."
420+
else
421+
echo "Compiling for darwin-$PLATFORM/arm64..."
422+
CC=o64-clang CXX=o64-clang++ HOST=arm64-apple-darwin15 PREFIX=/usr/local $BUILD_DEPS /deps ${DEPS_ARGS[@]}
423+
if [[ "$USEMODULES" == false ]]; then
424+
CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go get $V $X "${T[@]}" --ldflags="$LDSTRIP $V $LD" -d $PACK_RELPATH
425+
fi
426+
CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build $V $X $TP $MOD "${T[@]}" --ldflags="$LDSTRIP $V $LD" $R $BM -o "/build/$NAME-darwin-$PLATFORM-arm64$R`extension darwin`" $PACK_RELPATH
422427
fi
423-
CC=o64-clang CXX=o64-clang++ GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build $V $X $TP $MOD "${T[@]}" --ldflags="$LDSTRIP $V $LD" $R $BM -o "/build/$NAME-darwin-$PLATFORM-arm64$R`extension darwin`" $PACK_RELPATH
424428
fi
425429
# Remove any automatically injected deployment target vars
426430
unset MACOSX_DEPLOYMENT_TARGET

Diff for: docker/go-1.15.10/Dockerfile

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## GENERATED. DO NOT EDIT DIRECTLY.
2+
FROM techknowlogick/xgo:base
3+
4+
ENV GO_VERSION 11510
5+
6+
RUN \
7+
export ROOT_DIST=https://dl.google.com/go/go1.15.10.linux-amd64.tar.gz && \
8+
export ROOT_DIST_SHA=4aa1267517df32f2bf1cc3d55dfc27d0c6b2c2b0989449c96dd19273ccca051d && \
9+
\
10+
$BOOTSTRAP_PURE

Diff for: docker/go-1.15.9/Dockerfile

-10
This file was deleted.

Diff for: docker/go-1.15.x/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
## GENERATED. DO NOT EDIT DIRECTLY.
2-
FROM techknowlogick/xgo:go-1.15.9
2+
FROM techknowlogick/xgo:go-1.15.10

Diff for: docker/go-1.16.1/Dockerfile

-10
This file was deleted.

Diff for: docker/go-1.16.2/Dockerfile

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## GENERATED. DO NOT EDIT DIRECTLY.
2+
FROM techknowlogick/xgo:base
3+
4+
ENV GO_VERSION 1162
5+
6+
RUN \
7+
export ROOT_DIST=https://dl.google.com/go/go1.16.2.linux-amd64.tar.gz && \
8+
export ROOT_DIST_SHA=542e936b19542e62679766194364f45141fde55169db2d8d01046555ca9eb4b8 && \
9+
\
10+
$BOOTSTRAP_PURE

Diff for: docker/go-1.16.x/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
## GENERATED. DO NOT EDIT DIRECTLY.
2-
FROM techknowlogick/xgo:go-1.16.1
2+
FROM techknowlogick/xgo:go-1.16.2

0 commit comments

Comments
 (0)