ci: properly differentiate between windows build artifacts on PRs

PCSX2 · Dec 22, 2023 · c72982d · c72982d
1 parent fdaccee
commit c72982d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/.github/workflows/scripts/common/name-artifacts.sh b/.github/workflows/scripts/common/name-artifacts.sh
@@ -8,6 +8,7 @@
 
 # Inputs as env-vars
 # OS
+# BUILD_CONFIGURATION
 # BUILD_SYSTEM
 # ARCH
 # SIMD
@@ -35,6 +36,23 @@ if [[ ! -z "${BUILD_SYSTEM}" ]]; then
   fi
 fi
 
+# Isolate artifacts produced with different build systems, otherwise they overwrite each other
+# and you have no idea what you got!
+if [[ ! -z "${BUILD_SYSTEM}" ]]; then
+  # differentiate between clang and msvc
+  if [[ "${BUILD_CONFIGURATION,,}" == *"clang"* ]]; then
+      NAME="${NAME}-clang"
+  else
+      NAME="${NAME}-msvc"
+  fi
+  # also differentiate between sse4 and avx2
+  if [[ "${BUILD_CONFIGURATION,,}" == *"avx2"* ]]; then
+      NAME="${NAME}-avx2"
+  else
+      NAME="${NAME}-sse4"
+  fi
+fi
+
 # Add PR / Commit Metadata
 if [ "$EVENT_NAME" == "pull_request" ]; then
   PR_SHA=$(git rev-parse --short "${PR_SHA}")

diff --git a/.github/workflows/windows_build_qt.yml b/.github/workflows/windows_build_qt.yml
@@ -63,6 +63,7 @@ jobs:
         shell: bash
         env:
           OS: windows
+          BUILD_CONFIGURATION: ${{ inputs.configuration }}
           BUILD_SYSTEM: ${{ inputs.buildSystem }}
           ARCH: ${{ inputs.platform }}
           SIMD: ${{ inputs.simd }}