From 1ab52ba4a34f4349d704fb7515f9d42d4aacc94e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 26 Apr 2023 12:57:25 +0300
Subject: [PATCH] github: Generalize the patterns for moving artifacts that are
 to be uploaded

Exclude the artifacts from the asserts build, if available.
---
 .github/workflows/build.yml            | 3 ++-
 .github/workflows/upload-artifacts.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8a764b5..570ba0b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -579,7 +579,8 @@ jobs:
         uses: actions/download-artifact@v3
       - name: Rearrange files
         run: |
-          mv windows-*-toolchain/*.zip linux-toolchain/*.tar.xz macos-toolchain/*.tar.xz .
+          rm -rf linux-asserts*
+          mv *-toolchain/*.zip *-toolchain/*.tar.xz .
       - name: Upload binaries
         env:
           GITHUB_TOKEN: ${{github.token}}
diff --git a/.github/workflows/upload-artifacts.yml b/.github/workflows/upload-artifacts.yml
index 04190e5..9989089 100644
--- a/.github/workflows/upload-artifacts.yml
+++ b/.github/workflows/upload-artifacts.yml
@@ -28,7 +28,8 @@ jobs:
           commit: ${{inputs.commit}}
       - name: Rearrange files
         run: |
-          mv windows-*-toolchain/*.zip linux-toolchain/*.tar.xz macos-toolchain/*.tar.xz .
+          rm -rf linux-asserts*
+          mv *-toolchain/*.zip *-toolchain/*.tar.xz .
       - name: Upload binaries
         env:
           GITHUB_TOKEN: ${{github.token}}