CI: update macOS runners

macos-latest is based on AArch64 now: https://github.com/actions/runner-images
anrieff · Jun 11, 2024 · cc064be · cc064be
1 parent f189611
commit cc064be
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 20 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,36 +23,45 @@ jobs:
         ./configure
         make dist
 
-    - name: Download macOS artifacts
+    - name: Download macOS x86_64 artifacts
       uses: dawidd6/action-download-artifact@v3
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         workflow: unix.yml
         commit: ${{ github.sha }}
-        name: macos
-        path: macos
+        name: macos-x86_64
+        path: macos-x86_64
 
-    - name: Download Windows (32-bit) artifacts
+    - name: Download macOS AArch64 artifacts
+      uses: dawidd6/action-download-artifact@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        workflow: unix.yml
+        commit: ${{ github.sha }}
+        name: macos-aarch64
+        path: macos-aarch64
+
+    - name: Download Windows ix86 artifacts
       uses: dawidd6/action-download-artifact@v3
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         workflow: windows.yml
         commit: ${{ github.sha }}
-        name: win32
-        path: win32
+        name: windows-ix86
+        path: windows-ix86
 
-    - name: Download Windows (64-bit) artifacts
+    - name: Download Windows x86_64 artifacts
       uses: dawidd6/action-download-artifact@v3
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         workflow: windows.yml
         commit: ${{ github.sha }}
-        name: win64
-        path: win64
+        name: window-x86_64
+        path: window-x86_64
 
     - name: Compress artifacts
       run: |
-        for dir in macos win32 win64; do
+        for dir in macos-* windows-*; do
           zip -r "libcpuid-$VERSION-$dir.zip" "$dir"
         done
       env:
@@ -70,7 +79,8 @@ jobs:
 
           As a convenience, the following binaries are provided:
           - A source tarball;
-          - Build for 64-bit macOS (built under [macOS 14.X](https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md));
-          - Build for 32-bit Windows, using MSVC XX.XX, in Debug, Release and Release DLL configurations (built under [Windows Server 2022](https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md));
-          - Build for 64-bit Windows, using MSVC XX.XX, in Debug, Release and Release DLL configurations (built under [Windows Server 2022](https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md)).
-        artifacts: "libcpuid-${{ env.VERSION }}.tar.gz,libcpuid-${{ env.VERSION }}-macos.zip,libcpuid-${{ env.VERSION }}-win32.zip,libcpuid-${{ env.VERSION }}-win64.zip"
+          - Build for x86_64 macOS (built under [macOS 13.X](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md));
+          - Build for AArch64 macOS (built under [macOS 14.X](https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md));
+          - Build for ix86 Windows, using MSVC XX.XX, in Debug, Release and Release DLL configurations (built under [Windows Server 2022](https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md));
+          - Build for x86_64 Windows, using MSVC XX.XX, in Debug, Release and Release DLL configurations (built under [Windows Server 2022](https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md)).
+        artifacts: "libcpuid-${{ env.VERSION }}.tar.gz,libcpuid-${{ env.VERSION }}-macos-x86_64.zip,libcpuid-${{ env.VERSION }}-macos-aarch64.zip,libcpuid-${{ env.VERSION }}-windows-ix86.zip,libcpuid-${{ env.VERSION }}-window-x86_64.zip"
diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml
@@ -15,8 +15,9 @@ jobs:
     strategy:
       matrix:
         os:
-          - { label: macos-latest, name: macos }
-          - { label: ubuntu-latest, name: linux }
+          - { label: macos-latest, name: macos-aarch64 }
+          - { label: macos-13, name: macos-x86_64 }
+          - { label: ubuntu-latest, name: linux-x86_64 }
     env:
       OS_NAME: ${{ matrix.os.name }}
 
@@ -29,6 +30,13 @@ jobs:
     - name: Build
       run: cmake --build build
 
+    # - name: Run cpuid_tool
+    #   run: |
+    #     echo "RAW dump"
+    #     ./build/cpuid_tool/cpuid_tool --save=-
+    #     echo "Report"
+    #     ./build/cpuid_tool/cpuid_tool --all
+
     - name: Run tests
       run: |
         make -C build consistency

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -16,8 +16,8 @@ jobs:
       matrix:
         config: [Debug, Release, ReleaseDLL]
         platform:
-          - { bitness: x32, ms: Win32, name: win32 }
-          - { bitness: x64, ms: x64, name: win64 }
+          - { bitness: x32, ms: Win32, name: windows-ix86 }
+          - { bitness: x64, ms: x64, name: window-x86_64 }
     env:
       CONFIG: ${{ matrix.config }}
       BITNESS: ${{ matrix.platform.bitness }}
@@ -73,8 +73,8 @@ jobs:
     strategy:
       matrix:
         platform:
-          - win32
-          - win64
+          - windows-ix86
+          - window-x86_64
 
     steps:
     - name: Merge artifacts for ${{ matrix.platform }}