rpm

phusion · Oct 13, 2024 · a68a137 · a68a137
1 parent c0ee4a4
commit a68a137
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml
@@ -21,22 +21,25 @@ jobs:
         run: echo "distros=[$(awk -F= '/DEFAULT_DISTROS/{print $2}' packaging/rpm/internal/lib/distro_info.sh | sed -e 's/ /", "/g')]" >> "$GITHUB_OUTPUT"
 
   test:
-    name: "Test ${{ matrix.distro }} ${{ matrix.arch.name }} packages"
+    name: "Test ${{ matrix.distro }} ${{ matrix.arch.rpm_arch }} packages"
     needs: define-matrix
     strategy:
       fail-fast: false
       matrix:
         distro: ${{ fromJSON(needs.define-matrix.outputs.distros) }}
         arch:
-          - name: amd64
+          - rpm_arch: x86_64
+            docker_arch: amd64
             runner: ubuntu-24.04
-          - name: arm64
+          - rpm_arch: aarch64
+            docker_arch: arm64
             runner: passenger-ubuntu-24.04-arm64-4cpu
     runs-on: ${{ matrix.arch.runner }}
     env:
       WORKSPACE: ${{ github.workspace }}
-      ARCHITECTURE: ${{ matrix.arch.name }}
-      CACHE_DIR: ${{ github.workspace }}/cache/rpm-test/${{ matrix.distro }}-${{ matrix.arch.name }}
+      RPM_ARCH: ${{ matrix.arch.rpm_arch }}
+      DOCKER_ARCH: ${{ matrix.arch.docker_arch }}
+      CACHE_DIR: ${{ github.workspace }}/cache/rpm-test/${{ matrix.distro }}-${{ matrix.arch.rpm_arch }}
       DISTRIBUTION: ${{ matrix.distro }}
     steps:
     - uses: actions/checkout@v4