build both target arches for darwin

smatting · Apr 17, 2024 · cb5d94f · cb5d94f
1 parent ca736a0
commit cb5d94f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -52,8 +52,7 @@ jobs:
     runs-on: macos-11
     strategy:
       matrix:
-        # target_arch: [ x86_64, arm64 ]
-        target_arch: [ arm64 ]
+        target_arch: [ x86_64, arm64 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -91,7 +90,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          architecture: 'arm64'
+          architecture: ${{ matrix.target_arch }}
           python-version: '3.10.11'
 
       - shell: bash
@@ -119,5 +118,5 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: build-result-darwin
+          name: build-result-darwin-${{ matrix.target_arch }}
           path: dist/*.dmg
diff --git a/scripts/package-mac.sh b/scripts/package-mac.sh
@@ -17,7 +17,7 @@ ln -s "/Applications" "$temp_dir/Applications"
 
 tmp_dmg="./tmp.dmg"
 
-hdiutil create -srcfolder "$temp_dir" -volname "pointer-cc $POINTER_CC_VERSION" \
+hdiutil create -srcfolder "$temp_dir" -volname "pointer-cc $POINTER_CC_VERSION ${TARGET_ARCH:-x86_64}" \
     -format UDRW -ov -fs HFS+ "$tmp_dmg"
 
 hdiutil convert "$tmp_dmg" -format UDZO -o "$destination_dmg"