From 7b33f66b4c76afe7eb24e3dc302913b702aa8c32 Mon Sep 17 00:00:00 2001
From: Ryan Clary <9618975+mrclary@users.noreply.github.com>
Date: Thu, 31 Oct 2024 15:03:26 -0700
Subject: [PATCH] Change artifact name if schedule event. If two branches are
 run, the artifact names must be distinct.

---
 .github/workflows/installers-conda.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/installers-conda.yml b/.github/workflows/installers-conda.yml
index f8a70da882d..d39dbdbaa8a 100644
--- a/.github/workflows/installers-conda.yml
+++ b/.github/workflows/installers-conda.yml
@@ -112,6 +112,7 @@ jobs:
     needs:
       - build-matrix
     strategy:
+      fail-fast: false
       matrix:
         branch: ${{ fromJson(needs.build-matrix.outputs.branch) }}
     uses: ./.github/workflows/build-subrepos.yml
@@ -143,6 +144,7 @@ jobs:
       MACOS_INSTALLER_CERTIFICATE: ${{ secrets.MACOS_INSTALLER_CERTIFICATE }}
       APPLICATION_PWD: ${{ secrets.APPLICATION_PWD }}
       CONSTRUCTOR_TARGET_PLATFORM: ${{ matrix.target-platform }}
+      MATRIX_BRANCH: ${{ matrix.branch }}
 
     steps:
       - name: Checkout Code
@@ -290,11 +292,15 @@ jobs:
           python build_installers.py ${args[@]}
 
           SPYVER=$(python build_installers.py --version)
-          PKG_NAME=$(ls $DISTDIR | grep Spyder-)
+          PKG_PATH=$(python build_installers.py --artifact-name)
+          PKG_NAME=$(basename $PKG_PATH)
+          ARTIFACT_NAME=${PKG_NAME%.*}
+          [[ "$GITHUB_EVENT_NAME" == "schedule" ]] && ARTIFACT_NAME=$ARTIFACT_NAME-$MATRIX_BRANCH
+
           echo "SPYVER=$SPYVER" >> $GITHUB_ENV
           echo "PKG_NAME=$PKG_NAME" >> $GITHUB_ENV
-          echo "ARTIFACT_NAME=${PKG_NAME%.*}" >> $GITHUB_ENV
-          echo "PKG_PATH=$DISTDIR/$PKG_NAME" >> $GITHUB_ENV
+          echo "ARTIFACT_NAME=$ARTIFACT_NAME" >> $GITHUB_ENV
+          echo "PKG_PATH=$PKG_PATH" >> $GITHUB_ENV
 
       - name: Test macOS or Linux Installer
         if: runner.os != 'Windows'