[release-1.31] Fix release workflow (#7124)

Signed-off-by: Brooks Newberry <[email protected]>

.github/workflows/release.yml

@@ -61,6 +61,9 @@ jobs:
 
     - name: Publish Image Runtime
       uses: rancher/ecm-distro-tools/actions/publish-image@master
+      env:
+        GOARCH: amd64
+        GOOS: linux
       with:
         image: "rke2-runtime"
         tag: ${{ github.ref_name }}
@@ -77,6 +80,9 @@ jobs:
 
     - name: Publish Image Runtime (Windows)
       uses: rancher/ecm-distro-tools/actions/publish-image@master
+      env:
+        GOARCH: amd64
+        GOOS: linux
       with:
         image: "rke2-runtime"
         tag: ${{ github.ref_name }}
@@ -144,6 +150,9 @@ jobs:
 
     - name: Publish Image Runtime
       uses: rancher/ecm-distro-tools/actions/publish-image@master
+      env:
+        GOARCH: arm64
+        GOOS: linux
       with:
         image: "rke2-runtime"
         tag: ${{ github.ref_name }}
@@ -191,6 +200,9 @@ jobs:
 
     - name: Manifest
       uses: rancher/ecm-distro-tools/actions/publish-image@master
+      env:
+        GOARCH: amd64
+        GOOS: linux
       with:
         image: "rke2-runtime"
         tag: ${{ github.ref_name }}

Makefile

@@ -52,11 +52,11 @@ build-image-runtime:                      ## Build the runtime image
 	./scripts/build-image-runtime
 
 .PHONY: publish-image-runtime
-publish-image-runtime: build-image-runtime
+publish-image-runtime:
 	./scripts/publish-image-runtime
 
 .PHONY: publish-image-runtime-windows
-publish-image-runtime: build-image-runtime
+publish-image-runtime-windows:
 	./scripts/publish-image-runtime-windows
 
 .PHONY: validate

scripts/version.sh

@@ -8,7 +8,7 @@ K3S_PKG=github.com/k3s-io/k3s
 RKE2_PKG=github.com/rancher/rke2
 GO=${GO-go}
 GOARCH=${GOARCH:-$("${GO}" env GOARCH)}
-ARCH=${ARCH:-$("${GO}" env GOARCH)}
+ARCH=${ARCH:-"${GOARCH}"}
 GOOS=${GOOS:-$("${GO}" env GOOS)}
 if [ -z "$GOOS" ]; then
     if [ "${OS}" == "Windows_NT" ]; then