From 6e2b4b17e62b92d9bb1d00e4353bcabe76925506 Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Sat, 3 Aug 2024 07:40:32 +0200
Subject: [PATCH] chore: Update artifact names and paths in build workflows

---
 .github/workflows/linux-alpha-build.yml   |  9 +++++----
 .github/workflows/macos-alpha-build.yml   |  8 ++++----
 .github/workflows/windows-alpha-build.yml | 13 ++++++++++---
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/linux-alpha-build.yml b/.github/workflows/linux-alpha-build.yml
index 733924a87..5378a53fc 100644
--- a/.github/workflows/linux-alpha-build.yml
+++ b/.github/workflows/linux-alpha-build.yml
@@ -120,20 +120,21 @@ jobs:
 
       - name: Rename artifacts
         run: |
-          mv dist/zen-*.tar.bz2 "zen.linux.tar.bz2"
-          mv dist/output.mar linux.mar
+          mv dist/zen-*.tar.bz2 "zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2"
+          mv dist/output.mar linux${{ matrix.generic == true && '-generic' || '' }}.mar
 
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
+
           name: zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
-          path: ./zen.linux.tar.bz2
+          path: ./zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
 
       - name: Upload mar
         uses: actions/upload-artifact@v4
         with:
           name: linux${{ matrix.generic == true && '-generic' || '' }}.mar
-          path: ./linux.mar
+          path: ./linux${{ matrix.generic == true && '-generic' || '' }}.mar
 
       - name: Upload update manifests
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/macos-alpha-build.yml b/.github/workflows/macos-alpha-build.yml
index 3bee97eef..b8da2fc5e 100644
--- a/.github/workflows/macos-alpha-build.yml
+++ b/.github/workflows/macos-alpha-build.yml
@@ -100,20 +100,20 @@ jobs:
 
       - name: Rename artifacts
         run: |
-          mv ./dist/*.dmg "zen.macos.dmg"
-          mv ./dist/output.mar macos.mar
+          mv ./dist/*.dmg "zen.macos-${{ matrix.arch }}.dmg"
+          mv ./dist/output.mar macos-${{ matrix.arch }}.mar
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: zen.macos-${{ matrix.arch }}.dmg
-          path: ./zen.macos.dmg
+          path: ./zen.macos-${{ matrix.arch }}.dmg
 
       - name: Upload mar
         uses: actions/upload-artifact@v4
         with:
           name: macos-${{ matrix.arch }}.mar
-          path: ./macos.mar
+          path: ./macos-${{ matrix.arch }}.mar
 
       - name: Upload update manifests
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml
index a11fc49aa..1d768621c 100644
--- a/.github/workflows/windows-alpha-build.yml
+++ b/.github/workflows/windows-alpha-build.yml
@@ -171,12 +171,19 @@ jobs:
           set -x
           mv ./zen.win64.zip ./zen.win64-pgo-stage-1.zip
 
+      - name: Rename artifacts
+        if: ${{ !inputs.generate-gpo }}
+        run: |
+          mv ./zen.win64.zip zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
+          mv ./windows.mar windows${{ matrix.generic == true && '-generic' || '' }}.mar
+          mv ./dist/zen.installer.exe ./dist/zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         if: ${{ !inputs.generate-gpo }}
         with:
           name: zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
-          path: ./zen.win64.zip
+          path: ./zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
 
       - name: Upload PGO build
         uses: actions/upload-artifact@v4
@@ -190,14 +197,14 @@ jobs:
         if: ${{ !inputs.generate-gpo }}
         with:
           name: windows${{ matrix.generic == true && '-generic' || '' }}.mar
-          path: ./windows.mar
+          path: ./windows${{ matrix.generic == true && '-generic' || '' }}.mar
 
       - name: Upload installer
         uses: actions/upload-artifact@v4
         if: ${{ !inputs.generate-gpo }}
         with:
           name: zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
-          path: ./dist/zen.installer.exe
+          path: ./dist/zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
 
       - name: Upload installer stub
         uses: actions/upload-artifact@v4