From 359630817d0a6d9d1ac5e28a8db502674321bfa0 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 27 Oct 2025 14:58:16 -0400 Subject: [PATCH 1/3] Fix cross arch Signed-off-by: Joseph --- .github/workflows/cross-arch-build-test.yml | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cross-arch-build-test.yml b/.github/workflows/cross-arch-build-test.yml index f620a650..0e7c5570 100644 --- a/.github/workflows/cross-arch-build-test.yml +++ b/.github/workflows/cross-arch-build-test.yml @@ -43,37 +43,37 @@ jobs: run: | set -e echo "Generated binaries:" - ls -la kubectl-oadp-* || { + ls -la kubectl-oadp_* || { echo "❌ No binaries found" exit 1 } echo "" echo "File details:" - file kubectl-oadp-* || echo "⚠️ File command not available" + file kubectl-oadp_* || echo "⚠️ File command not available" - name: Upload Linux binaries uses: actions/upload-artifact@v4 with: name: linux-binaries path: | - kubectl-oadp-linux-amd64 - kubectl-oadp-linux-arm64 + kubectl-oadp_${{ github.ref_name }}_linux-amd64 + kubectl-oadp_${{ github.ref_name }}_linux-arm64 - name: Upload macOS binaries uses: actions/upload-artifact@v4 with: name: macos-binaries path: | - kubectl-oadp-darwin-amd64 - kubectl-oadp-darwin-arm64 + kubectl-oadp_${{ github.ref_name }}_darwin-amd64 + kubectl-oadp_${{ github.ref_name }}_darwin-arm64 - name: Upload Windows binaries uses: actions/upload-artifact@v4 with: name: windows-binaries path: | - kubectl-oadp-windows-amd64.exe - kubectl-oadp-windows-arm64.exe + kubectl-oadp_${{ github.ref_name }}_windows-amd64.exe + kubectl-oadp_${{ github.ref_name }}_windows-arm64.exe - name: Run host tests run: | @@ -95,10 +95,10 @@ jobs: include: - os: ubuntu-latest arch: amd64 - binary: kubectl-oadp-linux-amd64 + binary: kubectl-oadp_${{ github.ref_name }}_linux-amd64 - os: ubuntu-24.04-arm arch: arm64 - binary: kubectl-oadp-linux-arm64 + binary: kubectl-oadp_${{ github.ref_name }}_linux-arm64 runs-on: ${{ matrix.os }} @@ -202,10 +202,10 @@ jobs: include: - os: macos-13 # Intel arch: amd64 - binary: kubectl-oadp-darwin-amd64 + binary: kubectl-oadp_${{ github.ref_name }}_darwin-amd64 - os: macos-latest # Apple Silicon arch: arm64 - binary: kubectl-oadp-darwin-arm64 + binary: kubectl-oadp_${{ github.ref_name }}_darwin-arm64 runs-on: ${{ matrix.os }} @@ -309,10 +309,10 @@ jobs: include: - os: windows-latest # amd64 arch: amd64 - binary: kubectl-oadp-windows-amd64.exe + binary: kubectl-oadp_${{ github.ref_name }}_windows-amd64.exe - os: windows-11-arm # arm64 arch: arm64 - binary: kubectl-oadp-windows-arm64.exe + binary: kubectl-oadp_${{ github.ref_name }}_windows-arm64.exe runs-on: ${{ matrix.os }} From 368beb380d59945969a40de041e14a95e3b01199 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 27 Oct 2025 15:00:07 -0400 Subject: [PATCH 2/3] underscore Signed-off-by: Joseph --- .github/workflows/cross-arch-build-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cross-arch-build-test.yml b/.github/workflows/cross-arch-build-test.yml index 0e7c5570..29c82d50 100644 --- a/.github/workflows/cross-arch-build-test.yml +++ b/.github/workflows/cross-arch-build-test.yml @@ -56,24 +56,24 @@ jobs: with: name: linux-binaries path: | - kubectl-oadp_${{ github.ref_name }}_linux-amd64 - kubectl-oadp_${{ github.ref_name }}_linux-arm64 + kubectl-oadp_${{ github.ref_name }}_linux_amd64 + kubectl-oadp_${{ github.ref_name }}_linux_arm64 - name: Upload macOS binaries uses: actions/upload-artifact@v4 with: name: macos-binaries path: | - kubectl-oadp_${{ github.ref_name }}_darwin-amd64 - kubectl-oadp_${{ github.ref_name }}_darwin-arm64 + kubectl-oadp_${{ github.ref_name }}_darwin_amd64 + kubectl-oadp_${{ github.ref_name }}_darwin_arm64 - name: Upload Windows binaries uses: actions/upload-artifact@v4 with: name: windows-binaries path: | - kubectl-oadp_${{ github.ref_name }}_windows-amd64.exe - kubectl-oadp_${{ github.ref_name }}_windows-arm64.exe + kubectl-oadp_${{ github.ref_name }}_windows_amd64.exe + kubectl-oadp_${{ github.ref_name }}_windows_arm64.exe - name: Run host tests run: | From 32eeee806e623d6463b1fd98f693ae5a4dd01596 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 27 Oct 2025 15:01:09 -0400 Subject: [PATCH 3/3] fix Signed-off-by: Joseph --- .github/workflows/cross-arch-build-test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cross-arch-build-test.yml b/.github/workflows/cross-arch-build-test.yml index 29c82d50..0055c8d2 100644 --- a/.github/workflows/cross-arch-build-test.yml +++ b/.github/workflows/cross-arch-build-test.yml @@ -95,10 +95,10 @@ jobs: include: - os: ubuntu-latest arch: amd64 - binary: kubectl-oadp_${{ github.ref_name }}_linux-amd64 + binary: kubectl-oadp_${{ github.ref_name }}_linux_amd64 - os: ubuntu-24.04-arm arch: arm64 - binary: kubectl-oadp_${{ github.ref_name }}_linux-arm64 + binary: kubectl-oadp_${{ github.ref_name }}_linux_arm64 runs-on: ${{ matrix.os }} @@ -202,10 +202,10 @@ jobs: include: - os: macos-13 # Intel arch: amd64 - binary: kubectl-oadp_${{ github.ref_name }}_darwin-amd64 + binary: kubectl-oadp_${{ github.ref_name }}_darwin_amd64 - os: macos-latest # Apple Silicon arch: arm64 - binary: kubectl-oadp_${{ github.ref_name }}_darwin-arm64 + binary: kubectl-oadp_${{ github.ref_name }}_darwin_arm64 runs-on: ${{ matrix.os }} @@ -309,10 +309,10 @@ jobs: include: - os: windows-latest # amd64 arch: amd64 - binary: kubectl-oadp_${{ github.ref_name }}_windows-amd64.exe + binary: kubectl-oadp_${{ github.ref_name }}_windows_amd64.exe - os: windows-11-arm # arm64 arch: arm64 - binary: kubectl-oadp_${{ github.ref_name }}_windows-arm64.exe + binary: kubectl-oadp_${{ github.ref_name }}_windows_arm64.exe runs-on: ${{ matrix.os }}