dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cmake: enforce explicit artifact name

Browse source 
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>
This commit is contained in:
Seth Flynn 2025-06-12 20:42:54 -04:00
parent 6d960b9c3c
commit 3718c60844
No known key found for this signature in database
GPG key ID: D31BD0D494BBEE86
6 changed files with 9 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View file

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

1
cmake/commonPresets.json
View file

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

4
cmake/linuxPreset.json
View file

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

8
cmake/macosPreset.json
View file

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

18
cmake/windowsMSVCPreset.json
View file

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

10
cmake/windowsMinGWPreset.json
View file

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