From d77e99939fe7e71b3e355632fdba7246a3627d60 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Wed, 5 Feb 2025 17:30:36 +0100
Subject: [PATCH] Split the mas-cli archives & fix job dependencies

---
 .github/workflows/build.yaml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d33a95d46..13e0c8397 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -202,13 +202,17 @@ jobs:
             tar -czvf mas-cli-${arch}-linux.tar.gz --owner=0 --group=0 -C dist/${arch}/ .
           done
 
-      - name: Upload the artifacts
+      - name: Upload aarch64 archive
         uses: actions/upload-artifact@v4.6.0
         with:
-          name: binaries
-          path: |
-            mas-cli-aarch64-linux.tar.gz
-            mas-cli-x86_64-linux.tar.gz
+          name: mas-cli-aarch64-linux
+          path: mas-cli-aarch64-linux.tar.gz
+
+      - name: Upload x86_64 archive
+        uses: actions/upload-artifact@v4.6.0
+        with:
+          name: mas-cli-x86_64-linux
+          path: mas-cli-x86_64-linux.tar.gz
 
   build-image:
     name: Build and push Docker image
@@ -384,15 +388,16 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     needs:
-      - build-binaries
+      - assemble-archives
       - build-image
       - syn2mas
     steps:
       - name: Download the artifacts from the previous job
         uses: actions/download-artifact@v4
         with:
-          name: binaries
+          pattern: mas-cli-*
           path: artifacts
+          merge-multiple: true
 
       - name: Prepare a release
         uses: softprops/action-gh-release@v2
@@ -446,19 +451,19 @@ jobs:
     name: Update the unstable release
     runs-on: ubuntu-24.04
     needs:
-      - build-binaries
+      - assemble-archives
       - build-image
     if: github.ref == 'refs/heads/main'
 
     permissions:
       contents: write
-
     steps:
       - name: Download the artifacts from the previous job
         uses: actions/download-artifact@v4
         with:
-          name: binaries
+          pattern: mas-cli-*
           path: artifacts
+          merge-multiple: true
 
       - name: Update unstable git tag
         uses: actions/github-script@v7.0.1