Skip to content

Commit

Permalink
go1.16.2,go1.15.10 (#107)
Browse files Browse the repository at this point in the history
Co-authored-by: techknowlogick <techknowlogick@users.noreply.github.com>
  • Loading branch information
tklkbot and techknowlogick committed Mar 11, 2021
1 parent 945a59d commit d25c33f
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .golang_hash
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21096d066212c604c2b036c3541a501e82464cf7d88b8e1e186290d9af66cf50
ac6e67bb769bcbd7bd7d12431dddee26130e0a14f7dcf3920cf25ae56560c6c7
2 changes: 1 addition & 1 deletion .golang_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
go1.16.1,go1.15.9
go1.16.2,go1.15.10
2 changes: 1 addition & 1 deletion docker/base/bootstrap_pure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 10 additions & 6 deletions docker/base/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
10 changes: 10 additions & 0 deletions docker/go-1.15.10/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
10 changes: 0 additions & 10 deletions docker/go-1.15.9/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion docker/go-1.15.x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
## GENERATED. DO NOT EDIT DIRECTLY.
FROM techknowlogick/xgo:go-1.15.9
FROM techknowlogick/xgo:go-1.15.10
10 changes: 0 additions & 10 deletions docker/go-1.16.1/Dockerfile

This file was deleted.

10 changes: 10 additions & 0 deletions docker/go-1.16.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion docker/go-1.16.x/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
## GENERATED. DO NOT EDIT DIRECTLY.
FROM techknowlogick/xgo:go-1.16.1
FROM techknowlogick/xgo:go-1.16.2

0 comments on commit d25c33f

Please sign in to comment.