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

@@ -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"
 

cmake/commonPresets.json

@@ -8,6 +8,7 @@
 			"binaryDir": "build",
 			"installDir": "install",
 			"cacheVariables": {
+				"Launcher_BUILD_ARTIFACT": "$penv{ARTIFACT_NAME}",
 				"Launcher_BUILD_PLATFORM": "custom"
 			}
 		},

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"
 		}
 	],

cmake/macosPreset.json

@@ -22,8 +22,7 @@
 				"macos_base"
 			],
 			"cacheVariables": {
-				"CMAKE_OSX_ARCHITECTURES": "x86_64;arm64",
+				"CMAKE_OSX_ARCHITECTURES": "x86_64;arm64"
-				"Launcher_BUILD_ARTIFACT": "macOS-Qt6"
 			}
 		},
 		{
@@ -64,10 +63,7 @@
 				"base_ci",
 				"macos_universal_base"
 			],
-			"displayName": "macOS (CI)",
+			"displayName": "macOS (CI)"
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "macOS-Qt6"
-			}
 		}
 	],
 	"buildPresets": [

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",
+			"architecture": "arm64"
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MSVC-arm64-Qt6"
-			}
 		},
 		{
 			"name": "windows_msvc_debug",
@@ -67,10 +61,7 @@
 				"base_ci",
 				"windows_msvc_base"
 			],
-			"displayName": "Windows MSVC (CI)",
+			"displayName": "Windows MSVC (CI)"
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6"
-			}
 		},
 		{
 			"name": "windows_msvc_arm64_cross_ci",
@@ -78,10 +69,7 @@
 				"base_ci",
 				"windows_msvc_arm64_cross_base"
 			],
-			"displayName": "Windows MSVC (ARM64 cross, CI)",
+			"displayName": "Windows MSVC (ARM64 cross, CI)"
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MSVC-arm64-Qt6"
-			}
 		}
 	],
 	"buildPresets": [

cmake/windowsMinGWPreset.json

@@ -13,10 +13,7 @@
 				"lhs": "${hostSystemName}",
 				"rhs": "Windows"
 			},
-			"generator": "Ninja",
+			"generator": "Ninja"
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MinGW-w64-Qt6"
-			}
 		},
 		{
 			"name": "windows_mingw_debug",
@@ -40,10 +37,7 @@
 				"base_ci",
 				"windows_mingw_base"
 			],
-			"displayName": "Windows MinGW (CI)",
+			"displayName": "Windows MinGW (CI)"
-			"cacheVariables": {
-				"Launcher_BUILD_ARTIFACT": "Windows-MinGW-w64-Qt6"
-			}
 		}
 	],
 	"buildPresets": [