fix: github actions, build macos x64/arm64

Final2x · Jul 1, 2024 · 160b952 · 160b952
1 parent ce4ca12
commit 160b952
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/.github/workflows/CI-build.yml b/.github/workflows/CI-build.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10"]
-        os-version: ["macos-latest", "windows-latest", "ubuntu-20.04"]
+        os-version: ["windows-latest", "ubuntu-20.04", "macos-13", "macos-14"]
 
     runs-on: ${{ matrix.os-version }}
     steps:
@@ -52,17 +52,29 @@ jobs:
           cd dist\Final2x-core
           7z a -r Final2x-core-${{ matrix.os-version }}.zip *
 
-      - name: zip-unix
-        if: matrix.os-version != 'windows-latest'
+      - name: zip-linux
+        if: matrix.os-version == 'ubuntu-20.04'
         run: |
           cd dist/Final2x-core
           zip -9 -r Final2x-core-${{ matrix.os-version }}.zip ./*
 
+      - name: zip-macos-x64
+        if: matrix.os-version == 'macos-13'
+        run: |
+          cd dist/Final2x-core
+          zip -9 -r Final2x-core-macos-x64.zip ./*
+
+      - name: zip-macos-arm64
+        if: matrix.os-version == 'macos-14'
+        run: |
+          cd dist/Final2x-core
+          zip -9 -r Final2x-core-macos-arm64.zip ./*
+
       - name: upload
         uses: actions/upload-artifact@v3
         with:
           name: Final2x-core-${{ matrix.os-version }}
-          path: dist/Final2x-core/Final2x-core-${{ matrix.os-version }}.zip
+          path: dist/Final2x-core/*.zip
 
       - name: Test-windows
         if: matrix.os-version == 'windows-latest'

diff --git a/.github/workflows/CI-test.yml b/.github/workflows/CI-test.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10"]
-        os-version: ["windows-latest", "ubuntu-20.04", "macos-latest"]
+        os-version: ["windows-latest", "ubuntu-20.04", "macos-13", "macos-14"]
 
     runs-on: ${{ matrix.os-version }}
     steps:

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10"]
-        os-version: ["macos-latest", "windows-latest", "ubuntu-20.04"]
+        os-version: ["windows-latest", "ubuntu-20.04", "macos-13", "macos-14"]
 
     runs-on: ${{ matrix.os-version }}
     steps:
@@ -49,16 +49,28 @@ jobs:
           cd dist\Final2x-core
           7z a -r Final2x-core-${{ matrix.os-version }}.zip *
 
-      - name: zip-unix
-        if: matrix.os-version != 'windows-latest'
+      - name: zip-linux
+        if: matrix.os-version == 'ubuntu-20.04'
         run: |
           cd dist/Final2x-core
           zip -9 -r Final2x-core-${{ matrix.os-version }}.zip ./*
 
+      - name: zip-macos-x64
+        if: matrix.os-version == 'macos-13'
+        run: |
+          cd dist/Final2x-core
+          zip -9 -r Final2x-core-macos-x64.zip ./*
+
+      - name: zip-macos-arm64
+        if: matrix.os-version == 'macos-14'
+        run: |
+          cd dist/Final2x-core
+          zip -9 -r Final2x-core-macos-arm64.zip ./*
+
       - name: upload
         uses: actions/upload-artifact@v3
         with:
-          path: dist/Final2x-core/Final2x-core-${{ matrix.os-version }}.zip
+          path: dist/Final2x-core/*.zip
 
   Release:
     needs: [setup, build]

diff --git a/.github/workflows/pip-test.yml b/.github/workflows/pip-test.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        os-version: ["windows-latest", "ubuntu-20.04", "macos-latest"]
+        os-version: ["windows-latest", "ubuntu-20.04", "macos-13", "macos-14"]
 
     runs-on: ${{ matrix.os-version }}
     steps: