Use new go 1.17 go:build (#3314)

* Use new go 1.17 go:build * Arm setup needed golang 1.17 * Use proper pyenv for newer image on circleci
ddev · Oct 17, 2021 · bfedeae · bfedeae
1 parent 175cca9
commit bfedeae
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.ci-scripts/linux_arm64_setup.sh b/.ci-scripts/linux_arm64_setup.sh
@@ -5,7 +5,7 @@ set -o errexit
 # Basic tools
 
 set -x
-export GO_VERSION=1.16.2
+export GO_VERSION=1.17.2
 
 if [ ! -z "${DOCKERHUB_PULL_USERNAME:-}" ]; then
   set +x

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:202107-02
     working_directory: ~/ddev
     environment:
       DDEV_NONINTERACTIVE: "true"
@@ -37,7 +37,7 @@ jobs:
 
   lx_amd64_fpm_test:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:202107-02
     working_directory: ~/ddev
     environment:
       DDEV_TEST_WEBSERVER_TYPE: nginx-fpm
@@ -186,7 +186,7 @@ jobs:
 
   lx_apache_fpm_test:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:202107-02
     working_directory: ~/ddev
     environment:
       DDEV_TEST_WEBSERVER_TYPE: apache-fpm
@@ -221,7 +221,7 @@ jobs:
 
   lx_nfsmount_test:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:202107-02
     working_directory: ~/ddev
     environment:
       DDEV_TEST_USE_NFSMOUNT: true
@@ -258,7 +258,7 @@ jobs:
 
   staticrequired:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:202107-02
     working_directory: ~/ddev
     environment:
     steps:
@@ -277,7 +277,7 @@ jobs:
 
   lx_amd64_container_test:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:202107-02
     working_directory: ~/ddev
     environment:
       GOTEST_SHORT: true
@@ -319,7 +319,7 @@ jobs:
 
   lx_arm64_container_test:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:202107-02
     resource_class: arm.medium
     working_directory: ~/ddev
     environment:
@@ -373,7 +373,7 @@ jobs:
 
   artifacts:
     machine:
-      image: ubuntu-2004:202101-01
+      image: ubuntu-2004:202107-02
     working_directory: ~/ddev
     steps:
     - run: sudo mkdir /home/linuxbrew && sudo chown $(id -u) /home/linuxbrew

diff --git a/.circleci/linux_circle_vm_setup.sh b/.circleci/linux_circle_vm_setup.sh
@@ -37,7 +37,7 @@ git clone --branch v1.2.1 https://github.com/bats-core/bats-core.git /tmp/bats-c
 npm install --global markdownlint-cli
 markdownlint --version
 # readthedocs has ancient version of mkdocs in it.
-pyenv global 3.9.1 # added to make CircleCi give us pip3
+pyenv global 3.9.4 # added to make CircleCi give us pip3
 pip3 install -q yq mkdocs==0.17.5
 
 # Get the Stubs and Plugins for makensis; the linux makensis build doesn't do this.

diff --git a/pkg/nodeps/mariadb_values.go b/pkg/nodeps/mariadb_values.go
@@ -1,4 +1,4 @@
-// +build !arm64
+//go:build !arm64
 
 package nodeps
 

diff --git a/pkg/nodeps/mysql_values.go b/pkg/nodeps/mysql_values.go
@@ -1,4 +1,4 @@
-// +build !arm64
+//go:build !arm64
 
 package nodeps