Use x86-64 as the arch matrix value

For consistency with other workflow jobs.
pcolby · Jan 18, 2025 · bd0c6be · bd0c6be
1 parent 987f22e
commit bd0c6be
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -36,8 +36,8 @@ jobs:
           - 6.8.1
           - 6.9.0
         arch:
-          - amd64
           - arm64
+          - x86-64
         cc:
           - clang
           - gcc
@@ -59,7 +59,7 @@ jobs:
     steps:
       - name: Upgrade OS
         run: |
-          sudo apt-mark hold firefox grub-efi-${{ matrix.arch }}-signed
+          sudo apt-mark hold firefox grub-efi-${{ matrix.arch == 'arm64' && 'arm64' || 'amd64' }}-signed
           sudo apt update && sudo apt upgrade
           sudo apt install lcov llvm
       - uses: actions/setup-python@v5
@@ -77,7 +77,6 @@ jobs:
         uses: 'jurplel/install-qt-action@v4'
         with:
           version: ${{ matrix.qt }}
-          host: linux${{ matrix.arch == 'arm64' && '_arm64' || '' }}
           modules: ${{ startsWith(matrix.qt, '6') && 'qtconnectivity' || '' }}
           setup-python: false
           documentation: true
@@ -98,7 +97,7 @@ jobs:
         uses: jdpurcell/install-qt-action@b45c67aaa9e0ea77e59a7031ec14a12d5ddf4b35
         with:
           version: ${{ matrix.qt }}
-          host: linux${{ matrix.arch == 'arm64' && '_arm64' || '' }}
+          host: linux_arm64
           modules: ${{ startsWith(matrix.qt, '6') && 'qtconnectivity' || '' }}
           setup-python: false
           documentation: true
@@ -128,8 +127,7 @@ jobs:
         env:
           CC: ${{ matrix.cc }}
           CXX: ${{ matrix.cc == 'gcc' && 'g++' || 'clang++' }}
-          PROJECT_BUILD_ID: "${{ github.run_number }}.linux.${{ matrix.arch == 'arm64' && 'arm64' || 'x86-64'}}\
-            .${{ matrix.cc }}.qt-${{ matrix.qt }}"
+          PROJECT_BUILD_ID: ${{ github.run_number }}.linux.${{ matrix.arch }}.${{ matrix.cc }}.qt-${{ matrix.qt }}
         run: |
           [[ '${{ matrix.qt }}' =~ ^[56]$ ]] ||
             qtInstallDocs="$RUNNER_WORKSPACE/Qt/Docs/Qt-${QT_VERSION:-${{ matrix.qt }}}"