From: Soeren Apel <redacted>
Date: Mon, 4 Mar 2024 09:51:44 +0000 (+0100)
Subject: build.yml: Artifact upload test
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=f33797e09f288ccaf4a1abce300164b3be2a27f8;p=sigrok-build.git

build.yml: Artifact upload test
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b3bb454..da4ed95 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -106,6 +106,7 @@ jobs:
         with:
           name: artifact-pulseview-mxe
           path: pulseview/build/contrib/pulseview*installer.exe
+          overwrite: true
 
 
   build_sigrok-cli_mxe:
@@ -175,6 +176,7 @@ jobs:
         with:
           name: artifact-sigrok-cli-mxe
           path: sigrok-cli/contrib/sigrok-cli*installer.exe
+          overwrite: true
 
 
   build_pulseview_appimage:
@@ -265,6 +267,7 @@ jobs:
         with:
           name: artifact-pulseview-appimage
           path: sigrok-build/ci/appimage/appimage-build/PulseView-*.AppImage
+          overwrite: true
 
 
   build_sigrok-cli_appimage:
@@ -350,6 +353,7 @@ jobs:
         with:
           name: artifact-sigrok-cli-appimage
           path: sigrok-build/ci/appimage/appimage-build/sigrok-cli-*.AppImage
+          overwrite: true
 
 
   build_pulseview_macos:
@@ -422,6 +426,7 @@ jobs:
         with:
           name: artifact-pulseview-macos
           path: sigrok-build/ci/macos/PulseView*.dmg
+          overwrite: true
 
 
   build_sigrok-cli_macos:
@@ -489,6 +494,7 @@ jobs:
         with:
           name: artifact-sigrok-cli-macos
           path: sigrok-build/ci/macos/sigrok-cli*.dmg
+          overwrite: true
 
 
   publish:
@@ -508,13 +514,18 @@ jobs:
 #      - build_sigrok-cli_macos
 
     steps:
+      - name: Merge artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: artifacts
+          pattern: artifact-*
       - name: Install dependencies
         run: |
           # AppImage needs libfuse2 to start
           sudo apt-get update
           sudo apt-get install -y libfuse2
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
+#      - name: Download artifacts
+#        uses: actions/download-artifact@v4
       - name: Inspect directory after downloading artifacts
         run: ls -alFR
       - name: Upload artifacts and create (continuous) release