From d25c33fcd864f7841458723f0e24615c4dafe6ba Mon Sep 17 00:00:00 2001
From: tklkbot <45317580+tklkbot@users.noreply.github.com>
Date: Thu, 11 Mar 2021 17:27:05 -0500
Subject: [PATCH] go1.16.2,go1.15.10 (#107)
Co-authored-by: techknowlogick <techknowlogick@users.noreply.github.com>
---
.golang_hash | 2 +-
.golang_version | 2 +-
docker/base/bootstrap_pure.sh | 2 +-
docker/base/build.sh | 16 ++++++++++------
docker/go-1.15.10/Dockerfile | 10 ++++++++++
docker/go-1.15.9/Dockerfile | 10 ----------
docker/go-1.15.x/Dockerfile | 2 +-
docker/go-1.16.1/Dockerfile | 10 ----------
docker/go-1.16.2/Dockerfile | 10 ++++++++++
docker/go-1.16.x/Dockerfile | 2 +-
10 files changed, 35 insertions(+), 31 deletions(-)
create mode 100644 docker/go-1.15.10/Dockerfile
delete mode 100644 docker/go-1.15.9/Dockerfile
delete mode 100644 docker/go-1.16.1/Dockerfile
create mode 100644 docker/go-1.16.2/Dockerfile
diff --git a/.golang_hash b/.golang_hash
index 1acb131..a07db25 100644
--- a/.golang_hash
+++ b/.golang_hash
@@ -1 +1 @@
-21096d066212c604c2b036c3541a501e82464cf7d88b8e1e186290d9af66cf50
\ No newline at end of file
+ac6e67bb769bcbd7bd7d12431dddee26130e0a14f7dcf3920cf25ae56560c6c7
\ No newline at end of file
diff --git a/.golang_version b/.golang_version
index b9057ad..4870af6 100644
--- a/.golang_version
+++ b/.golang_version
@@ -1 +1 @@
-go1.16.1,go1.15.9
\ No newline at end of file
+go1.16.2,go1.15.10
\ No newline at end of file
diff --git a/docker/base/bootstrap_pure.sh b/docker/base/bootstrap_pure.sh
index e391e8c..d6cdf26 100644
--- a/docker/base/bootstrap_pure.sh
+++ b/docker/base/bootstrap_pure.sh
@@ -60,7 +60,7 @@ GOOS=windows GOARCH=386 CGO_ENABLED=1 CC=i686-w64-mingw32-gcc go install std
echo "Bootstrapping darwin/amd64..."
GOOS=darwin GOARCH=amd64 CGO_ENABLED=1 CC=o64-clang go install std
-if [ $GO_VERSION -ge 1160 ]; then
+if [[ "$GO_VERSION" != 115* ]]; then
echo "Bootstrapping darwin/arm64..."
GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 CC=o64-clang go install std
fi
diff --git a/docker/base/build.sh b/docker/base/build.sh
index e6fc0ec..9306449 100644
--- a/docker/base/build.sh
+++ b/docker/base/build.sh
@@ -396,7 +396,7 @@ for TARGET in $TARGETS; do
# Split the platform version and configure the deployment target
PLATFORM=`echo $XGOOS | cut -d '-' -f 2`
if [ "$PLATFORM" == "" ] || [ "$PLATFORM" == "." ] || [ "$PLATFORM" == "darwin" ]; then
- PLATFORM=10.6 # OS X Snow Leopard
+ PLATFORM=10.12 # OS X Sierra (min version support for golang)
fi
export MACOSX_DEPLOYMENT_TARGET=$PLATFORM
@@ -415,12 +415,16 @@ for TARGET in $TARGETS; do
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
fi
if [ $XGOARCH == "." ] || [ $XGOARCH == "arm64" ]; then
- echo "Compiling for darwin-$PLATFORM/arm64..."
- CC=o64-clang CXX=o64-clang++ HOST=arm64-apple-darwin15 PREFIX=/usr/local $BUILD_DEPS /deps ${DEPS_ARGS[@]}
- if [[ "$USEMODULES" == false ]]; then
- 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
+ if [[ "$GO_VERSION" == 115* ]]; then
+ echo "Go version too low, skipping darwin-$PLATFORM/arm64..."
+ else
+ echo "Compiling for darwin-$PLATFORM/arm64..."
+ CC=o64-clang CXX=o64-clang++ HOST=arm64-apple-darwin15 PREFIX=/usr/local $BUILD_DEPS /deps ${DEPS_ARGS[@]}
+ if [[ "$USEMODULES" == false ]]; then
+ 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
+ fi
+ 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
fi
- 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
fi
# Remove any automatically injected deployment target vars
unset MACOSX_DEPLOYMENT_TARGET
diff --git a/docker/go-1.15.10/Dockerfile b/docker/go-1.15.10/Dockerfile
new file mode 100644
index 0000000..c1e3f0d
--- /dev/null
+++ b/docker/go-1.15.10/Dockerfile
@@ -0,0 +1,10 @@
+## GENERATED. DO NOT EDIT DIRECTLY.
+FROM techknowlogick/xgo:base
+
+ENV GO_VERSION 11510
+
+RUN \
+ export ROOT_DIST=https://dl.google.com/go/go1.15.10.linux-amd64.tar.gz && \
+ export ROOT_DIST_SHA=4aa1267517df32f2bf1cc3d55dfc27d0c6b2c2b0989449c96dd19273ccca051d && \
+ \
+$BOOTSTRAP_PURE
diff --git a/docker/go-1.15.9/Dockerfile b/docker/go-1.15.9/Dockerfile
deleted file mode 100644
index 0e565b5..0000000
--- a/docker/go-1.15.9/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-## GENERATED. DO NOT EDIT DIRECTLY.
-FROM techknowlogick/xgo:base
-
-ENV GO_VERSION 1159
-
-RUN \
- export ROOT_DIST=https://dl.google.com/go/go1.15.9.linux-amd64.tar.gz && \
- export ROOT_DIST_SHA=a55f3e75bc1098045851d40ea74f9d77efc7958e9af85131a96ca387d38b1834 && \
- \
-$BOOTSTRAP_PURE
diff --git a/docker/go-1.15.x/Dockerfile b/docker/go-1.15.x/Dockerfile
index 495b078..a9a9f43 100644
--- a/docker/go-1.15.x/Dockerfile
+++ b/docker/go-1.15.x/Dockerfile
@@ -1,2 +1,2 @@
## GENERATED. DO NOT EDIT DIRECTLY.
-FROM techknowlogick/xgo:go-1.15.9
+FROM techknowlogick/xgo:go-1.15.10
diff --git a/docker/go-1.16.1/Dockerfile b/docker/go-1.16.1/Dockerfile
deleted file mode 100644
index 85b1254..0000000
--- a/docker/go-1.16.1/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-## GENERATED. DO NOT EDIT DIRECTLY.
-FROM techknowlogick/xgo:base
-
-ENV GO_VERSION 1161
-
-RUN \
- export ROOT_DIST=https://dl.google.com/go/go1.16.1.linux-amd64.tar.gz && \
- export ROOT_DIST_SHA=3edc22f8332231c3ba8be246f184b736b8d28f06ce24f08168d8ecf052549769 && \
- \
-$BOOTSTRAP_PURE
diff --git a/docker/go-1.16.2/Dockerfile b/docker/go-1.16.2/Dockerfile
new file mode 100644
index 0000000..4245330
--- /dev/null
+++ b/docker/go-1.16.2/Dockerfile
@@ -0,0 +1,10 @@
+## GENERATED. DO NOT EDIT DIRECTLY.
+FROM techknowlogick/xgo:base
+
+ENV GO_VERSION 1162
+
+RUN \
+ export ROOT_DIST=https://dl.google.com/go/go1.16.2.linux-amd64.tar.gz && \
+ export ROOT_DIST_SHA=542e936b19542e62679766194364f45141fde55169db2d8d01046555ca9eb4b8 && \
+ \
+$BOOTSTRAP_PURE
diff --git a/docker/go-1.16.x/Dockerfile b/docker/go-1.16.x/Dockerfile
index f911f13..a932c2b 100644
--- a/docker/go-1.16.x/Dockerfile
+++ b/docker/go-1.16.x/Dockerfile
@@ -1,2 +1,2 @@
## GENERATED. DO NOT EDIT DIRECTLY.
-FROM techknowlogick/xgo:go-1.16.1
+FROM techknowlogick/xgo:go-1.16.2