go1.16,go1.15.8 (#98)

techknowlogick · Feb 16, 2021 · b33106d · b33106d
1 parent 1ea8454
commit b33106d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
@@ -15,22 +15,24 @@ jobs:
       - name: get golang version 1
         run: |
           export VERSION=$(cat .golang_version | awk -F',' '{print $1}' | sed 's/go1/go-1/')
-          echo ::set-output name=value::$VERSION
           DOTS=$(echo -n $VERSION | awk -F"." '{print NF-1}')
           if [ "$DOTS" == "1" ]; then
+            echo ::set-output name=value::$VERSION.0
             echo ::set-output name=wildcard::$VERSION.x
           else
+            echo ::set-output name=value::$VERSION
             echo ::set-output name=wildcard::$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')
           fi
         id: golang_version_1
       - name: get golang version 2
         run: |
           export VERSION=$(cat .golang_version | awk -F',' '{print $2}' | sed 's/go1/go-1/')
-          echo ::set-output name=value::$VERSION
           DOTS=$(echo -n $VERSION | awk -F"." '{print NF-1}')
           if [ "$DOTS" == "1" ]; then
+            echo ::set-output name=value::$VERSION.0
             echo ::set-output name=wildcard::$VERSION.x
           else
+            echo ::set-output name=value::$VERSION
             echo ::set-output name=wildcard::$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')
           fi
         id: golang_version_2

diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml
@@ -12,22 +12,24 @@ jobs:
       - name: get golang version 1
         run: |
           export VERSION=$(cat .golang_version | awk -F',' '{print $1}' | sed 's/go1/go-1/')
-          echo ::set-output name=value::$VERSION
           DOTS=$(echo -n $VERSION | awk -F"." '{print NF-1}')
           if [ "$DOTS" == "1" ]; then
+            echo ::set-output name=value::$VERSION.0
             echo ::set-output name=wildcard::$VERSION.x
           else
+            echo ::set-output name=value::$VERSION
             echo ::set-output name=wildcard::$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')
           fi
         id: golang_version_1
       - name: get golang version 2
         run: |
           export VERSION=$(cat .golang_version | awk -F',' '{print $2}' | sed 's/go1/go-1/')
-          echo ::set-output name=value::$VERSION
           DOTS=$(echo -n $VERSION | awk -F"." '{print NF-1}')
           if [ "$DOTS" == "1" ]; then
+            echo ::set-output name=value::$VERSION.0
             echo ::set-output name=wildcard::$VERSION.x
           else
+            echo ::set-output name=value::$VERSION
             echo ::set-output name=wildcard::$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')
           fi
         id: golang_version_2

diff --git a/.golang_hash b/.golang_hash
@@ -1 +1 @@
-06e9985639291120f088ecbe456317d16903395403cc40b0b89a9280f1728540
+fc0a08ab7efa88bd9b1944974e82e7dba2e317c6b9a9e4145ad425cf2573efde
diff --git a/.golang_version b/.golang_version
@@ -1 +1 @@
-go1.15.8,go1.14.15
+go1.16,go1.15.8
diff --git a/docker/go-1.14.15/Dockerfile b/docker/go-1.14.15/Dockerfile
diff --git a/docker/go-1.16.0/Dockerfile b/docker/go-1.16.0/Dockerfile
@@ -0,0 +1,10 @@
+## GENERATED. DO NOT EDIT DIRECTLY.
+FROM techknowlogick/xgo:base
+
+ENV GO_VERSION 1160
+
+RUN \
+  export ROOT_DIST=https://dl.google.com/go/go1.16.linux-amd64.tar.gz && \
+  export ROOT_DIST_SHA=013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 && \
+  \
+$BOOTSTRAP_PURE
diff --git a/docker/go-1.14.x/Dockerfile → docker/go-1.16.x/Dockerfile b/docker/go-1.14.x/Dockerfile → docker/go-1.16.x/Dockerfile
@@ -1,2 +1,2 @@
 ## GENERATED. DO NOT EDIT DIRECTLY.
-FROM techknowlogick/xgo:go-1.14.15
+FROM techknowlogick/xgo:go-1.16.0
diff --git a/docker/go-latest/Dockerfile b/docker/go-latest/Dockerfile
@@ -1,2 +1,2 @@
 ## GENERATED. DO NOT EDIT DIRECTLY.
-FROM techknowlogick/xgo:go-1.15.x
+FROM techknowlogick/xgo:go-1.16.x