From 3718c60844cf080b158108e53d6a4f1c3f7a4428 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 12 Jun 2025 20:42:54 -0400
Subject: [PATCH] cmake: enforce explicit artifact name

It's much easier to determine this in CI and ensure our artifact names
are correct (I have made some accidents). They (and thus the updater)
can also easily be left out of local builds -- and probably should've
always been

Signed-off-by: Seth Flynn <getchoo@tuta.io>
---
 .github/workflows/build.yml   |  1 +
 cmake/commonPresets.json      |  1 +
 cmake/linuxPreset.json        |  4 ----
 cmake/macosPreset.json        |  8 ++------
 cmake/windowsMSVCPreset.json  | 18 +++---------------
 cmake/windowsMinGWPreset.json | 10 ++--------
 6 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7df86c3ec..c1ee0c761 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -146,6 +146,7 @@ jobs:
       - name: Run CMake workflow
         env:
           CMAKE_PRESET: ${{ steps.cmake-preset.outputs.preset }}
+          ARTIFACT_NAME: ${{ matrix.artifact-name }}-Qt6
         run: |
           cmake --workflow --preset "$CMAKE_PRESET"
 
diff --git a/cmake/commonPresets.json b/cmake/commonPresets.json
index 9cdf51649..2f4cbfa15 100644
--- a/cmake/commonPresets.json
+++ b/cmake/commonPresets.json
@@ -8,6 +8,7 @@
 			"binaryDir": "build",
 			"installDir": "install",
 			"cacheVariables": {
+				"Launcher_BUILD_ARTIFACT": "$penv{ARTIFACT_NAME}",
 				"Launcher_BUILD_PLATFORM": "custom"
 			}
 		},
diff --git a/cmake/linuxPreset.json b/cmake/linuxPreset.json
index b8bfe4ff0..984defa5d 100644
--- a/cmake/linuxPreset.json
+++ b/cmake/linuxPreset.json
@@ -15,7 +15,6 @@
 			},
 			"generator": "Ninja",
 			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Linux-Qt6",
 				"Launcher_ENABLE_JAVA_DOWNLOADER": "ON"
 			}
 		},
@@ -42,9 +41,6 @@
 				"linux_base"
 			],
 			"displayName": "Linux (CI)",
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Linux-Qt6"
-			},
 			"installDir": "/usr"
 		}
 	],
diff --git a/cmake/macosPreset.json b/cmake/macosPreset.json
index 726949934..de503d7a2 100644
--- a/cmake/macosPreset.json
+++ b/cmake/macosPreset.json
@@ -22,8 +22,7 @@
 				"macos_base"
 			],
 			"cacheVariables": {
-				"CMAKE_OSX_ARCHITECTURES": "x86_64;arm64",
-				"Launcher_BUILD_ARTIFACT": "macOS-Qt6"
+				"CMAKE_OSX_ARCHITECTURES": "x86_64;arm64"
 			}
 		},
 		{
@@ -64,10 +63,7 @@
 				"base_ci",
 				"macos_universal_base"
 			],
-			"displayName": "macOS (CI)",
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "macOS-Qt6"
-			}
+			"displayName": "macOS (CI)"
 		}
 	],
 	"buildPresets": [
diff --git a/cmake/windowsMSVCPreset.json b/cmake/windowsMSVCPreset.json
index eb6a38b19..603a0a9ff 100644
--- a/cmake/windowsMSVCPreset.json
+++ b/cmake/windowsMSVCPreset.json
@@ -12,9 +12,6 @@
 				"type": "equals",
 				"lhs": "${hostSystemName}",
 				"rhs": "Windows"
-			},
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6"
 			}
 		},
 		{
@@ -23,10 +20,7 @@
 			"inherits": [
 				"windows_msvc_base"
 			],
-			"architecture": "arm64",
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MSVC-arm64-Qt6"
-			}
+			"architecture": "arm64"
 		},
 		{
 			"name": "windows_msvc_debug",
@@ -67,10 +61,7 @@
 				"base_ci",
 				"windows_msvc_base"
 			],
-			"displayName": "Windows MSVC (CI)",
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6"
-			}
+			"displayName": "Windows MSVC (CI)"
 		},
 		{
 			"name": "windows_msvc_arm64_cross_ci",
@@ -78,10 +69,7 @@
 				"base_ci",
 				"windows_msvc_arm64_cross_base"
 			],
-			"displayName": "Windows MSVC (ARM64 cross, CI)",
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MSVC-arm64-Qt6"
-			}
+			"displayName": "Windows MSVC (ARM64 cross, CI)"
 		}
 	],
 	"buildPresets": [
diff --git a/cmake/windowsMinGWPreset.json b/cmake/windowsMinGWPreset.json
index 984caadd6..7c4adbcf2 100644
--- a/cmake/windowsMinGWPreset.json
+++ b/cmake/windowsMinGWPreset.json
@@ -13,10 +13,7 @@
 				"lhs": "${hostSystemName}",
 				"rhs": "Windows"
 			},
-			"generator": "Ninja",
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MinGW-w64-Qt6"
-			}
+			"generator": "Ninja"
 		},
 		{
 			"name": "windows_mingw_debug",
@@ -40,10 +37,7 @@
 				"base_ci",
 				"windows_mingw_base"
 			],
-			"displayName": "Windows MinGW (CI)",
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MinGW-w64-Qt6"
-			}
+			"displayName": "Windows MinGW (CI)"
 		}
 	],
 	"buildPresets": [