Merge pull request #86 from ginglis13/bump-go-122

packages: use GO_MAJOR for selecting Go version
bottlerocket-os · Aug 14, 2024 · 96800b8 · 96800b8
2 parents b57db7c + 7c2664e
commit 96800b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/ecr-credential-provider-1.30/ecr-credential-provider-1.30.spec b/packages/ecr-credential-provider-1.30/ecr-credential-provider-1.30.spec
@@ -49,7 +49,7 @@ Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-bin)
 %build
 %set_cross_go_flags
 
-export GO_VERSION="1.22.2"
+export GO_MAJOR="1.22"
 
 go build -ldflags="${GOLDFLAGS}" -o=ecr-credential-provider cmd/ecr-credential-provider/*.go
 gofips build -ldflags="${GOLDFLAGS}" -o=fips/ecr-credential-provider cmd/ecr-credential-provider/*.go

diff --git a/packages/host-ctr/host-ctr.spec b/packages/host-ctr/host-ctr.spec
@@ -44,7 +44,7 @@ Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-bin)
 cp -r %{_builddir}/sources/%{workspace_name}/* .
 
 %build
-export GO_VERSION="1.22.2"
+export GO_MAJOR="1.22"
 
 %set_cross_go_flags
 go build -ldflags="${GOLDFLAGS}" -o host-ctr ./cmd/host-ctr

diff --git a/packages/kubernetes-1.30/kubernetes-1.30.spec b/packages/kubernetes-1.30/kubernetes-1.30.spec
@@ -143,7 +143,7 @@ cp third_party/forked/golang/PATENTS PATENTS.golang
 %build
 export FORCE_HOST_GO=1
 
-export GO_VERSION="1.22.2"
+export GO_MAJOR="1.22"
 
 # Build codegen programs with the host toolchain.
 make hack/update-codegen.sh