From 3f196c04a66367d530e4b6911ae904ecef9fe025 Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Wed, 23 Oct 2024 22:46:04 -0700 Subject: [PATCH 1/4] fix publish-image-runtime-windows target Signed-off-by: Brooks Newberry --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6f2bec77f9..ef28501414 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ publish-image-runtime: build-image-runtime ./scripts/publish-image-runtime .PHONY: publish-image-runtime-windows -publish-image-runtime: build-image-runtime +publish-image-runtime-windows: build-image-runtime ./scripts/publish-image-runtime-windows .PHONY: validate From edfbbd7b5c730bed2c729e3e7bf197e9e12009dd Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Wed, 23 Oct 2024 22:46:35 -0700 Subject: [PATCH 2/4] cleanup make targets Signed-off-by: Brooks Newberry --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ef28501414..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-windows: build-image-runtime +publish-image-runtime-windows: ./scripts/publish-image-runtime-windows .PHONY: validate From 7c2d454c8150eb304966edef6b693b19f90e2d3d Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Wed, 23 Oct 2024 22:49:19 -0700 Subject: [PATCH 3/4] ARCH defaults to GOARCH Signed-off-by: Brooks Newberry --- scripts/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version.sh b/scripts/version.sh index 215a814828..65deb2bb91 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 From ed3942d03da2a16cba668269c53440280cecd841 Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Wed, 23 Oct 2024 22:51:39 -0700 Subject: [PATCH 4/4] set GOOS GOARCH Signed-off-by: Brooks Newberry --- .github/workflows/release.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 }}