mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
A few nits
create empty CMakeUserPresets.json file so build happens on first run comment doesn't apply anymore no need to specify the compiler when using msbuild@xxx ask ninja for the verbose command line when building
This commit is contained in:
committed by
majcosta
parent
d8728c9b92
commit
74f4979296
@@ -39,9 +39,6 @@ jobs:
|
||||
|
||||
if [[ '${{ inputs.build_all_languages }}' == 'true' || ( '${{ inputs.build_all_languages }}' == '' && "$full_release" == 'true' ) ]]
|
||||
then
|
||||
# the two letter short form could be removed if JA2LangPrefix is removed
|
||||
# the casing of the long form adheres to the one found in the gamedir-languages repo
|
||||
# for compilation only, the long form is transformed to upper case
|
||||
languages_json_array='["Chinese", "German", "English", "French", "Polish", "Italian", "Dutch", "Russian"]';
|
||||
else
|
||||
# English + some other language for compilation testing
|
||||
|
||||
@@ -58,8 +58,8 @@ jobs:
|
||||
run: |
|
||||
set -eux
|
||||
|
||||
cp -a CMakeUserPresets_VS2022.json CMakeUserPresets.json
|
||||
|
||||
touch CMakeUserPresets.json
|
||||
|
||||
JA2Language=$(echo '${{ inputs.language }}' | tr '[:lower:]' '[:upper:]')
|
||||
JA2Application=$(echo '${{ matrix.application }}' | tr '[:lower:]' '[:upper:]')
|
||||
|
||||
@@ -76,12 +76,10 @@ jobs:
|
||||
arch: x86
|
||||
- name: Prepare build
|
||||
run: |
|
||||
cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" `
|
||||
-DLanguages="$Env:JA2Language" `
|
||||
-DApplications="$Env:JA2Application"
|
||||
cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DLanguages="$Env:JA2Language" -DApplications="$Env:JA2Application"
|
||||
- name: Build
|
||||
run: |
|
||||
cmake --build build/
|
||||
cmake --build build/ -- -v
|
||||
- name: List build artifacts
|
||||
shell: bash
|
||||
run: |
|
||||
|
||||
Reference in New Issue
Block a user