update scaffolds for hybrid to use go 1.18 (#180)

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
operator-framework · Jun 8, 2022 · d3967d2 · d3967d2
1 parent 17304ff
commit d3967d2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 637 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: ~1.17
+        go-version: ~1.18
       id: go
 
     - name: Check out code into the Go module directory
@@ -56,7 +56,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: ~1.17
+        go-version: ~1.18
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/gomod.go b/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/gomod.go
@@ -46,7 +46,7 @@ func (f *GoMod) SetTemplateDefaults() error {
 const goModTemplate = `
 module {{ .Repo }}
 
-go 1.17
+go 1.18
 
 require (
 	sigs.k8s.io/controller-runtime {{ .ControllerRuntimeVersion }}

diff --git a/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/makefile.go
@@ -176,7 +176,7 @@ TMP_DIR=$$(mktemp -d) ;\
 cd $$TMP_DIR ;\
 go mod init tmp ;\
 echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
+GOBIN=$(PROJECT_DIR)/bin go get $(2) && GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
 rm -rf $$TMP_DIR ;\
 }
 endef

diff --git a/testdata/hybrid/memcached-operator/Makefile b/testdata/hybrid/memcached-operator/Makefile
@@ -103,7 +103,7 @@ TMP_DIR=$$(mktemp -d) ;\
 cd $$TMP_DIR ;\
 go mod init tmp ;\
 echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
+GOBIN=$(PROJECT_DIR)/bin go get $(2) && GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
 rm -rf $$TMP_DIR ;\
 }
 endef

diff --git a/testdata/hybrid/memcached-operator/go.mod b/testdata/hybrid/memcached-operator/go.mod
@@ -1,6 +1,6 @@
 module github.com/example/memcached-operator
 
-go 1.17
+go 1.18
 
 require (
 	github.com/onsi/ginkgo v1.16.5