From a142f7de7211abd0fc22da8cce3f3da1446b6a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Gro=C3=9F?= <julian.g@posteo.de>
Date: Mon, 2 Sep 2024 17:15:49 +0200
Subject: [PATCH] Try fixing master build uploads.

---
 .github/workflows/master_build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml
index b8c29c94e4..499f317f80 100644
--- a/.github/workflows/master_build.yml
+++ b/.github/workflows/master_build.yml
@@ -13,13 +13,13 @@ on:
 env:
   APP_NAME: interface
   BUILD_TYPE: Release
-  BUILD_NUMBER: ${{ github.run_number }}
+  BUILD_NUMBER: ${{ github.event.number }}_${{ github.sha }}
   CI_BUILD: Github
   GIT_COMMIT: ${{ github.sha }}
   # VCPKG did not build well on OSX disabling HIFI_VCPKG_BOOTSTRAP, which invokes a download to a working version of vcpkg
   # HIFI_VCPKG_BOOTSTRAP: true
   RELEASE_TYPE: PRODUCTION
-  RELEASE_NUMBER: ${{ github.run_number }}
+  RELEASE_NUMBER: ${{ github.event.number }}_${{ github.sha }}
   STABLE_BUILD: 0
   UPLOAD_BUCKET: overte-public
   UPLOAD_REGION: fra1
@@ -108,7 +108,7 @@ jobs:
         # Build type variables
         if [ "${{ matrix.build_type }}" = "full" ]; then
           echo "CLIENT_ONLY=FALSE" >> $GITHUB_ENV
-          echo "INSTALLER=Overte-master$BUILD_NUMBER-${{ steps.buildenv1.outputs.github_sha_short }}.$INSTALLER_EXT" >> $GITHUB_ENV
+          echo "INSTALLER=Overte-${{ github.event.number }}_${{ github.sha }}.$INSTALLER_EXT" >> $GITHUB_ENV
         else
           echo "CLIENT_ONLY=TRUE" >> $GITHUB_ENV
           echo "INSTALLER=Overte-Interface-master$BUILD_NUMBER-${{ steps.buildenv1.outputs.github_sha_short }}.$INSTALLER_EXT" >> $GITHUB_ENV
@@ -247,8 +247,8 @@ jobs:
     - name: Upload artifact to GitHub
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.ARTIFACT_PATTERN }}
-        path: ${{runner.workspace}}/build/${{ env.ARTIFACT_PATTERN }}
+        name: ${{ env.INSTALLER }}
+        path: ${{runner.workspace}}/build/${{ env.INSTALLER }}
         if-no-files-found: error
 
     #- name: Archive symbols