From a6a72621dc9660584a0d2a3ca8218cca0308e6bd Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Thu, 24 Oct 2024 07:27:16 -0700 Subject: [PATCH] [release-1.29] Fix release workflow (#7126) Signed-off-by: Brooks Newberry --- .github/workflows/release.yml | 12 ++++++++++++ Makefile | 4 ++-- scripts/version.sh | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 591f5c2ce8..ba4fdaff03 100644 --- a/.github/workflows/release.yml +++ b/.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 }} diff --git a/Makefile b/Makefile index 6f2bec77f9..261afd66d9 100644 --- a/Makefile +++ b/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 diff --git a/scripts/version.sh b/scripts/version.sh index e603e8beee..b55bb683be 100755 --- a/scripts/version.sh +++ b/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