From 25af4c11a0ebb3d5b058969f05f49ed99bf9bd61 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Sat, 4 Jan 2025 10:42:31 -0500 Subject: [PATCH] correct the target architecture strings for arm, arm64 Linux packages --- .github/workflows/publish-linux-packages.yml | 6 +++--- .github/workflows/test-deployments.yml | 2 +- dist/dist-packages/linux/nfpm-openziti-controller.yaml | 2 +- dist/dist-packages/linux/nfpm-openziti-router.yaml | 2 +- dist/dist-packages/linux/nfpm-openziti.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-linux-packages.yml b/.github/workflows/publish-linux-packages.yml index 803cbd838..9d7582685 100644 --- a/.github/workflows/publish-linux-packages.yml +++ b/.github/workflows/publish-linux-packages.yml @@ -29,8 +29,8 @@ jobs: rpm: aarch64 - goreleaser: armv7 gox: arm - deb: armv7 - rpm: armv7 + deb: armhf + rpm: armv7hl packager: - rpm - deb @@ -41,7 +41,7 @@ jobs: ZITI_MAINTAINER: "OpenZiti Maintainers " ZITI_HOMEPAGE: "https://openziti.io" ZITI_VENDOR: "NetFoundry Inc." - GOARCH: ${{ matrix.arch.goreleaser }} + TARGETARCH: ${{ matrix.packager == 'deb' && matrix.arch.deb || matrix.arch.rpm }} MINIMUM_SYSTEMD_VERSION: 232 ZITI_DEB_TEST_REPO: ${{ vars.ZITI_DEB_TEST_REPO || 'zitipax-openziti-deb-test' }} ZITI_RPM_TEST_REPO: ${{ vars.ZITI_RPM_TEST_REPO || 'zitipax-openziti-rpm-test' }} diff --git a/.github/workflows/test-deployments.yml b/.github/workflows/test-deployments.yml index ab152cfc3..20b09f14e 100644 --- a/.github/workflows/test-deployments.yml +++ b/.github/workflows/test-deployments.yml @@ -64,7 +64,7 @@ jobs: ZITI_MAINTAINER: "OpenZiti Maintainers " ZITI_HOMEPAGE: "https://openziti.io" ZITI_VENDOR: "NetFoundry Inc." - GOARCH: ${{ matrix.arch.goreleaser }} + TARGETARCH: ${{ matrix.arch.goreleaser }} MINIMUM_SYSTEMD_VERSION: 232 - name: Upload Package to Build Summary diff --git a/dist/dist-packages/linux/nfpm-openziti-controller.yaml b/dist/dist-packages/linux/nfpm-openziti-controller.yaml index 819c71e31..4fd2fdbbe 100644 --- a/dist/dist-packages/linux/nfpm-openziti-controller.yaml +++ b/dist/dist-packages/linux/nfpm-openziti-controller.yaml @@ -3,7 +3,7 @@ # check https://nfpm.goreleaser.com/configuration for detailed usage # name: openziti-controller -arch: ${GOARCH} +arch: ${TARGETARCH} platform: linux version: ${ZITI_VERSION} prerelease: ${ZITI_REV} diff --git a/dist/dist-packages/linux/nfpm-openziti-router.yaml b/dist/dist-packages/linux/nfpm-openziti-router.yaml index 648f86a33..21ab2798f 100644 --- a/dist/dist-packages/linux/nfpm-openziti-router.yaml +++ b/dist/dist-packages/linux/nfpm-openziti-router.yaml @@ -3,7 +3,7 @@ # check https://nfpm.goreleaser.com/configuration for detailed usage # name: openziti-router -arch: ${GOARCH} +arch: ${TARGETARCH} platform: linux version: ${ZITI_VERSION} prerelease: ${ZITI_REV} diff --git a/dist/dist-packages/linux/nfpm-openziti.yaml b/dist/dist-packages/linux/nfpm-openziti.yaml index 49d11a761..eb5c85bca 100644 --- a/dist/dist-packages/linux/nfpm-openziti.yaml +++ b/dist/dist-packages/linux/nfpm-openziti.yaml @@ -3,7 +3,7 @@ # check https://nfpm.goreleaser.com/configuration for detailed usage # name: openziti -arch: ${GOARCH} +arch: ${TARGETARCH} platform: linux version: ${ZITI_VERSION} prerelease: ${ZITI_REV}