* Update build workflow to add back osx-arm64

PikachuEXE · Nov 25, 2024 · fe7ca72 · fe7ca72
1 parent 0293daf
commit fe7ca72
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 49 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,9 +20,7 @@ jobs:
           - win-x64
           - win-arm64
           - osx-x64
-          # `osx-arm64` disabled due to "macOS gatekeeper"
-          # See details in https://github.com/FreeTubeApp/FreeTube/pull/2113
-          # - osx-arm64
+          - osx-arm64
         include:
         - runtime: linux-x64
           os: ubuntu-latest
@@ -36,8 +34,8 @@ jobs:
         - runtime: osx-x64
           os: macOS-latest
 
-#        - runtime: osx-arm64
-#          os: macOS-latest
+        - runtime: osx-arm64
+          os: macOS-latest
 
         - runtime: win-x64
           os: windows-latest
@@ -298,32 +296,39 @@ jobs:
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
       with:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-x64.dmg
 
-#    - name: Upload Mac arm64 .dmg Artifact
-#      uses: actions/upload-artifact@v4
-#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-#      with:
-#        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
-#        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
+    - name: Upload Mac arm64 .dmg Artifact
+      uses: actions/upload-artifact@v4
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
 
     - name: Upload Mac x64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
       with:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.zip
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.zip
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.zip
 
     - name: Upload Mac x64 .7z Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
       with:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z
-
-#    - name: Upload Mac arm64 .zip Artifact
-#      uses: actions/upload-artifact@v4
-#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-#      with:
-#        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
-#        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
+
+    - name: Upload Mac arm64 .zip Artifact
+      uses: actions/upload-artifact@v4
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
+
+    - name: Upload Mac arm64 .7z Artifact
+      uses: actions/upload-artifact@v4
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.7z
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.7z
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,9 +20,7 @@ jobs:
           - win-x64
           - win-arm64
           - osx-x64
-          # `osx-arm64` disabled due to "macOS gatekeeper"
-          # See details in https://github.com/FreeTubeApp/FreeTube/pull/2113
-          # - osx-arm64
+          - osx-arm64
         include:
         - runtime: linux-x64
           os: ubuntu-latest
@@ -36,8 +34,8 @@ jobs:
         - runtime: osx-x64
           os: macOS-latest
 
-#        - runtime: osx-arm64
-#          os: macOS-latest
+        - runtime: osx-arm64
+          os: macOS-latest
 
         - runtime: win-x64
           os: windows-latest
@@ -303,19 +301,19 @@ jobs:
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.dmg
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.dmg
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-x64.dmg
         asset_content_type: application/x-apple-diskimage
 
-#    - name: Upload Mac arm64 .dmg Release
-#      uses: actions/upload-release-asset@v1
-#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-#      env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#      with:
-#        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-#        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.dmg
-#        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.dmg
-#        asset_content_type: application/x-apple-diskimage
+    - name: Upload Mac arm64 .dmg Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.dmg
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.dmg
+        asset_content_type: application/x-apple-diskimage
 
     - name: Upload Mac x64 .zip Release
       uses: actions/upload-release-asset@v1
@@ -325,7 +323,7 @@ jobs:
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.zip
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac.zip
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.zip
         asset_content_type: application/zip
 
     - name: Upload Mac x64 .7z Release
@@ -336,16 +334,27 @@ jobs:
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.7z
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac.7z
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.7z
         asset_content_type: application/x-7z-compressed
 
-#    - name: Upload Mac arm64 .zip Release
-#      uses: actions/upload-release-asset@v1
-#      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-#      env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#      with:
-#        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
-#        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
-#        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
-#        asset_content_type: application/x-apple-diskimage
+    - name: Upload Mac arm64 .zip Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
+        asset_content_type: application/x-apple-diskimage
+
+    - name: Upload Mac arm64 .7z Release
+      uses: actions/upload-release-asset@v1
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.7z
+        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.7z
+        asset_content_type: application/x-7z-compressed