Arm64 ci

.github/workflows/build.yml

@@ -35,37 +35,41 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest]
         include:
           - os: windows-latest
             windows-arch: x64
           - os: windows-latest
             windows-arch: Win32
+          - os: windows-11-arm
+            windows-arch: ARM64
+          - os: windows-11-arm
+            windows-arch: ARM64EC
 
     runs-on: ${{matrix.os}}
 
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     - name: Create Build Directory
-      run: cmake -E make_directory ${{runner.workspace}}/build
+      run: cmake -E make_directory ./build
 
     - name: Run CMake
       shell: bash
-      working-directory: ${{runner.workspace}}/build
+      working-directory: ./build
       run: |
-        if [[ "${{ matrix.os }}" == "windows-latest" ]]; then
+        if [[ -n "${{ matrix.windows-arch }}" ]]; then
           cmake -DENABLE_CLILOADER=1 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -A ${{ matrix.windows-arch }} $GITHUB_WORKSPACE
         else
           cmake -DENABLE_CLILOADER=1 -DCMAKE_BUILD_TYPE=$BUILD_TYPE                               $GITHUB_WORKSPACE
         fi
 
     - name: Build
-      working-directory: ${{runner.workspace}}/build
+      working-directory: ./build
       shell: bash
       run: cmake --build . --parallel 4 --config $BUILD_TYPE
 
     #- name: Test
-    #  working-directory: ${{runner.workspace}}/build
+    #  working-directory: ./build
     #  shell: bash
     #  run: ctest -C $BUILD_TYPE

.github/workflows/release.yml

@@ -12,22 +12,22 @@ env:
   BUILD_TYPE: Release
 
 jobs:
-  release:
+  build:
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, ubuntu-24.04-arm]
         include:
           - os: windows-latest
             windows-arch: x64
           - os: windows-latest
             windows-arch: Win32
+          - os: windows-11-arm
+            windows-arch: ARM64
+          - os: windows-11-arm
+            windows-arch: ARM64EC
 
     runs-on: ${{matrix.os}}
 
-    permissions:
-      contents: write
-      id-token: write
-
     steps:
     - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
     # This isn't working currently, see https://github.com/actions/checkout/issues/1467.
@@ -49,7 +49,7 @@ jobs:
       shell: bash
       working-directory: ./build
       run: |
-        if [[ "${{ matrix.os }}" == "windows-latest" ]]; then
+        if [[ -n "${{ matrix.windows-arch }}" ]]; then
           cmake -DENABLE_CLILOADER=1 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -A ${{ matrix.windows-arch }} $GITHUB_WORKSPACE
         else
           cmake -DENABLE_CLILOADER=1 -DCMAKE_BUILD_TYPE=$BUILD_TYPE                               $GITHUB_WORKSPACE
@@ -60,48 +60,42 @@ jobs:
       shell: bash
       run: cmake --build . --parallel --config $BUILD_TYPE --target package
 
-    - name: Update Python (Windows)
-      if: matrix.os == 'windows-latest'
-      uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+    - name: Upload Package
+      uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
       with:
-        python-version: '3.12'
+        name: package-${{ matrix.os }}${{ matrix.windows-arch && format('-{0}', matrix.windows-arch) || '' }}
+        path: |
+          ./build/clintercept-*.zip
+          ./build/clintercept-*.tar.gz
+        if-no-files-found: error
 
-    - name: Sign (Windows zip)
-      if: |
-        startsWith(github.ref, 'refs/tags/') &&
-        matrix.os == 'windows-latest'
-      uses: sigstore/gh-action-sigstore-python@790bc6befb9d733738f18d8f895854b453640ec9 #v3.5.0
+  # Sign and release on Linux, since the signing tools do not install on Windows on Arm.
+  release:
+    needs: build
+    if: startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+    - name: Download Packages
+      uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
       with:
-        inputs: |
-          ./build/clintercept-*.zip
+        pattern: package-*
+        path: ./packages
+        merge-multiple: true
 
-    - name: Sign (Linux tgz)
-      if: |
-        startsWith(github.ref, 'refs/tags/') &&
-        matrix.os == 'ubuntu-latest'
+    - name: Sign
       uses: sigstore/gh-action-sigstore-python@790bc6befb9d733738f18d8f895854b453640ec9 #v3.5.0
       with:
         inputs: |
-          ./build/clintercept-*.tar.gz
-
-    - name: Release (Windows zip)
-      if: |
-        startsWith(github.ref, 'refs/tags/') &&
-        matrix.os == 'windows-latest'
-      uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3
-      with:
-        draft: true
-        files: |
-          ./build/clintercept-*.zip
-          ./build/clintercept-*.zip.sigstore.json
+          ./packages/clintercept-*
 
-    - name: Release (Linux tgz)
-      if: |
-        startsWith(github.ref, 'refs/tags/') &&
-        matrix.os == 'ubuntu-latest'
+    - name: Release
       uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3
       with:
         draft: true
         files: |
-          ./build/clintercept-*.tar.gz
-          ./build/clintercept-*.tar.gz.sigstore.json
+          ./packages/clintercept-*

cmake_modules/package.cmake

@@ -46,6 +46,17 @@ else()
     endif()
 endif()
 
+# By default CPack names packages by OS and pointer size only, so give Arm packages a distinct name.
+if(NOT DEFINED CPACK_SYSTEM_NAME)
+    if(WIN32 AND CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "ARM64")
+        set(CPACK_SYSTEM_NAME "win-arm64")
+    elseif(WIN32 AND CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "ARM64EC")
+        set(CPACK_SYSTEM_NAME "win-arm64ec")
+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)$")
+        set(CPACK_SYSTEM_NAME "Linux-aarch64")
+    endif()
+endif()
+
 set(CPACK_COMPONENT_INSTALL ON)
 set(CPACK_DEB_COMPONENT_INSTALL ON)
 set(CPACK_RPM_COMPONENT_INSTALL ON)