From bce6fe4784d6d67610893a3dc168561fe9c4231f Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 18 Mar 2024 20:04:58 +0100
Subject: [PATCH] chore/ci: Fix naming collision in release artifacts. (#9509)

Release Notes:

- N/A
---
 .github/workflows/ci.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5edd0918ab..ec5b1cb683 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -209,6 +209,12 @@ jobs:
       - name: Create macOS app bundle
         run: script/bundle-mac
 
+      - name: Rename single-architecture binaries
+        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
+        run: |
+          mv target/aarch64-apple-darwin/release/Zed.dmg target/aarch64-apple-darwin/release/Zed-aarch64.dmg
+          mv target/aarch64-apple-darwin/release/Zed.dmg target/aarch64-apple-darwin/release/Zed-x86_64.dmg
+
       - name: Upload app bundle (universal) to workflow run if main branch or specific label
         uses: actions/upload-artifact@v4
         if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
@@ -219,15 +225,15 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
         with:
-          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}_aarch64.dmg
-          path: target/aarch64-apple-darwin/release/Zed.dmg
+          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-aarch64.dmg
+          path: target/aarch64-apple-darwin/release/Zed-aarch64.dmg
 
       - name: Upload app bundle (x86_64) to workflow run if main branch or specific label
         uses: actions/upload-artifact@v4
         if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
         with:
-          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}_x86_64.dmg
-          path: target/x86_64-apple-darwin/release/Zed.dmg
+          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-x86_64.dmg
+          path: target/x86_64-apple-darwin/release/Zed-x86_64.dmg
 
       - uses: softprops/action-gh-release@v1
         name: Upload app bundle to release
@@ -236,8 +242,9 @@ jobs:
           draft: true
           prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
           files: |
-            target/aarch64-apple-darwin/release/Zed.dmg
-            target/x86_64-apple-darwin/release/Zed.dmg
+            target/aarch64-apple-darwin/release/Zed-aarch64.dmg
+            target/x86_64-apple-darwin/release/Zed-x86_64.dmg
+            target/release/Zed.dmg
           body: ""
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}