Preserve symlinks via tar

qgis · Jan 7, 2025 · db544d8 · db544d8
1 parent fe60324
commit db544d8
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/.github/workflows/build-macos-qt6.yml b/.github/workflows/build-macos-qt6.yml
@@ -131,16 +131,16 @@ jobs:
           cmake --build build
           cmake --build build --target bundle
 
+      - name: Archive app
+        run: |
+          tar -cvhzf qgis-app-${{steps.workflow-artifact-ids.outputs.display-name}}-${{ matrix.triplet }}.tar.gz --preserve-links ./build/_CPack_Packages/Darwin/External/*/*.app
+
       - name: 📤 Upload app
-        # Switch back to actions/upload when https://github.com/actions/upload-artifact/issues/93 is fixed
-        uses: eXhumer/upload-artifact@0b7d5f5684d3f642f978d2faad9ade64f5b4dd57
+        uses: actions/upload-artifact@v4
         with:
-          follow-symlinks: false
-          if-no-files-found: error
-          compression-level: 9
           name: qgis-app-${{steps.workflow-artifact-ids.outputs.display-name}}-${{ matrix.triplet }}
           path: |
-            build/_CPack_Packages/Darwin/External/*/*.app
+            qgis-app-${{steps.workflow-artifact-ids.outputs.display-name}}-${{ matrix.triplet }}.tar.gz
 
   schedule_download_comment:
     name: Create dmg
@@ -162,19 +162,19 @@ jobs:
       - name: 📤 Download app
         uses: actions/download-artifact@v4
         with:
-          name: qgis-app-${{steps.workflow-artifact-ids.outputs.display-name}}-x64-osx-dynamic-release
-          path: |
-            x64
-
-      - name: 📤 Download app
-        uses: actions/download-artifact@v4
-        with:
-          name: qgis-app-${{steps.workflow-artifact-ids.outputs.display-name}}-arm64-osx-dynamic-release
+          name: |
+            qgis-app-${{steps.workflow-artifact-ids.outputs.display-name}}-x64-osx-dynamic-release
+            qgis-app-${{steps.workflow-artifact-ids.outputs.display-name}}-arm64-osx-dynamic-release
           path: |
-            arm64
+            artifacts
 
       - name: Create universal app
         run: |
+          mkdir -p x64
+          tar -xvzf ./artifacts/qgis-app-${{steps.workflow-artifact-ids.outputs.display-name}}-x64-osx-dynamic-release.tar.gz -C x64
+          mkdir -p arm64
+          tar -xvzf ./artifacts/qgis-app-${{steps.workflow-artifact-ids.outputs.display-name}}-arm64-osx-dynamic-release.tar.gz -C arm64
+          
           wget https://raw.githubusercontent.com/m-kuhn/lipo-dir-merge/refs/heads/main/lipo-dir-merge.py
           python lipo-dir-merge.py x64 arm64 universal