cmake: use build platform from environment
This allows all CI builds to be deemed "official" Signed-off-by: Seth Flynn <getchoo@tuta.io>
This commit is contained in:
parent
3718c60844
commit
c03f854fb8
2 changed files with 3 additions and 2 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -146,7 +146,9 @@ jobs:
|
||||||
- name: Run CMake workflow
|
- name: Run CMake workflow
|
||||||
env:
|
env:
|
||||||
CMAKE_PRESET: ${{ steps.cmake-preset.outputs.preset }}
|
CMAKE_PRESET: ${{ steps.cmake-preset.outputs.preset }}
|
||||||
|
|
||||||
ARTIFACT_NAME: ${{ matrix.artifact-name }}-Qt6
|
ARTIFACT_NAME: ${{ matrix.artifact-name }}-Qt6
|
||||||
|
BUILD_PLATFORM: official
|
||||||
run: |
|
run: |
|
||||||
cmake --workflow --preset "$CMAKE_PRESET"
|
cmake --workflow --preset "$CMAKE_PRESET"
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
"installDir": "install",
|
"installDir": "install",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"Launcher_BUILD_ARTIFACT": "$penv{ARTIFACT_NAME}",
|
"Launcher_BUILD_ARTIFACT": "$penv{ARTIFACT_NAME}",
|
||||||
"Launcher_BUILD_PLATFORM": "custom"
|
"Launcher_BUILD_PLATFORM": "$penv{BUILD_PLATFORM}"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -40,7 +40,6 @@
|
||||||
"base_release"
|
"base_release"
|
||||||
],
|
],
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"Launcher_BUILD_PLATFORM": "official",
|
|
||||||
"Launcher_FORCE_BUNDLED_LIBS": "ON"
|
"Launcher_FORCE_BUNDLED_LIBS": "ON"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue