chore: use github arm runners

sithlord48 · Jan 28, 2025 · 4715549 · 4715549
1 parent da59425
commit 4715549
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,15 +40,20 @@ jobs:
           echo "version=$VER" >> $GITHUB_OUTPUT
 
   deb_builder:
-    name: debianBuilder-${{matrix.config.name}}
+    name: debianBuilder-${{matrix.config.name}}-${{matrix.config.debArch}}
     runs-on: ${{matrix.config.os}}
+    needs: precheck
     strategy:
       fail-fast: false
       matrix:
         config:
         - {
              name: jammy , os: ubuntu-22.04
              , debArch: amd64
+          },
+        - {
+             name: jammy , os: ubuntu-22.04-arm
+             , debArch: arm64
           }
     steps:
     - name: Checkout
@@ -63,14 +68,16 @@ jobs:
         rm libff7tk*.deb
     - name: Build
       run: |
-        ${{env.cmakeConfigure}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK_DEBIAN_PACKAGE_RELEASE=${{github.run_attempt}}~${{matrix.config.name}}
-        cmake --build build
+        ${{env.cmakeConfigure}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK_PACKAGE_VERSION="${{ needs.precheck.outputs.version }}" -DCPACK_DEBIAN_PACKAGE_RELEASE=${{github.run_attempt}}~${{matrix.config.name}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
+        cmake --build build --target package
+        mv build/blackchocobo[-_]*.* .
         cpack -G DEB -C ${{env.BuildType}} --config build/CPackConfig.cmake
     - name: Upload
       uses: actions/upload-artifact@v4
       with:
-        name: debian-artifacts-${{ matrix.config.name }}
-        path: blackchocobo*.deb
+        name: debian-artifacts-${{ matrix.config.name }}-${{matrix.config.debArch}}
+        path: blackchocobo[-_]*.*
+
   main_build:
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
@@ -192,11 +199,6 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - {
-           name: "jammy"
-           , arch: aarch64, distro: ubuntu22.04
-           , debArch: arm64
-          }
         - {
            name: "jammy"
            , arch: armv7, distro: ubuntu22.04