1.14 in workflow files

Hornswoggles · Jun 8, 2020 · 944e963 · 944e963
1 parent 18ce06d
commit 944e963
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,10 +15,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up Go 1.12
+    - name: Set up Go 1.14
       uses: actions/setup-go@v1
       with:
-        go-version: 1.12
+        go-version: 1.14
 
     - name: Test source code
       run:  script/test-source

diff --git a/.github/workflows/system.yml b/.github/workflows/system.yml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Set up Go 1.12
+    - name: Set up Go 1.14
       uses: actions/setup-go@v1
       with:
-        go-version: 1.12
+        go-version: 1.14
 
     - name: check out
       uses: actions/checkout@v2

diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
@@ -11,10 +11,10 @@ jobs:
     #     backend: [sqlite, MySQL]
 
     steps:
-    - name: Set up Go 1.12
+    - name: Set up Go 1.14
       uses: actions/setup-go@v1
       with:
-        go-version: 1.12
+        go-version: 1.14
 
     - name: Start local MySQL
       run: sudo /etc/init.d/mysql start

diff --git a/script/ensure-go-installed b/script/ensure-go-installed
@@ -1,13 +1,7 @@
 #!/bin/bash
 
-PREFERRED_GO_VERSION=go1.12.6
-SUPPORTED_GO_VERSIONS='go1.1[2345]'
-
-GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
-GO_PKG_DARWIN_SHA=ea78245e43de2996fa0973033064b33f48820cfe39f4f3c6e953040925cc5815
-
-GO_PKG_LINUX=${PREFERRED_GO_VERSION}.linux-amd64.tar.gz
-GO_PKG_LINUX_SHA=dbcf71a3c1ea53b8d54ef1b48c85a39a6c9a935d01fc8291ff2b92028e59913c
+PREFERRED_GO_VERSION=go1.14.4
+SUPPORTED_GO_VERSIONS='go1.1[456]'
 
 export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 cd $ROOTDIR