[GitHub Actions] Tweak debug symbol upload

Warzone2100 · Jun 11, 2024 · 73e1603 · 73e1603
1 parent cb08d46
commit 73e1603
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/.github/workflows/CI_flatpak.yml b/.github/workflows/CI_flatpak.yml
@@ -298,13 +298,7 @@ jobs:
         path: '${{ steps.repo-tar.outputs.REPO_TAR_FILE }}'
 
   upload-debug-symbols:
-    strategy:
-      matrix:
-        include:
-          - arch: "x86_64"
-          - arch: "arm64"
-      fail-fast: false
-    name: 'Upload Debug Symbols (${{ matrix.arch }})'
+    name: 'Upload Debug Symbols'
     permissions:
       contents: read
     runs-on: ubuntu-latest
@@ -327,13 +321,15 @@ jobs:
       - name: Download Debug Symbols
         uses: actions/download-artifact@v4
         with:
-          name: 'debugsymbols_linux_flatpak_${{ matrix.arch }}'
+          pattern: 'debugsymbols_linux_flatpak_*'
           path: ./dl-debug/symbols
+          merge-multiple: false
       - name: Download Additional Debug Files
         uses: actions/download-artifact@v4
         with:
-          name: 'debugdependencylibsnapshot_linux_flatpak_${{ matrix.arch }}'
+          pattern: 'debugdependencylibsnapshot_linux_flatpak_*'
           path: ./dl-debug/additional
+          merge-multiple: false
       - name: Display structure of downloaded files
         run: ls -R
         working-directory: ./dl-debug

diff --git a/.github/workflows/CI_ubuntu.yml b/.github/workflows/CI_ubuntu.yml
@@ -310,14 +310,7 @@ jobs:
         WZ_GITHUB_REF: ${{ steps.checkout-config.outputs.WZ_GITHUB_REF }}
 
   upload-debug-symbols:
-    strategy:
-      matrix:
-        include:
-          - output-suffix: "ubuntu20.04"
-            arch: "amd64"
-          - output-suffix: "ubuntu22.04"
-            arch: "amd64"
-    name: 'Upload Debug Symbols (${{ matrix.matrix }})'
+    name: 'Upload Debug Symbols'
     permissions:
       contents: read
     runs-on: ubuntu-latest
@@ -339,8 +332,9 @@ jobs:
       - name: Download Artifacts
         uses: actions/download-artifact@v4
         with:
-          name: 'debugsymbols_${{ matrix.output-suffix }}_${{ matrix.arch }}'
+          pattern: 'debugsymbols_*'
           path: ./dl-debug-symbols
+          merge-multiple: false
       - name: Display structure of downloaded files
         run: ls -R
         working-directory: ./dl-debug-symbols