From 74f497929660fec6965ae52e78fb7f5b48e55460 Mon Sep 17 00:00:00 2001 From: Marco Antonio Jaguaribe Costa Date: Sun, 15 Jan 2023 14:04:40 -0300 Subject: [PATCH] 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 --- .github/workflows/build.yml | 3 --- .github/workflows/build_language.yml | 10 ++++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4bc31d7..5529cd97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/build_language.yml b/.github/workflows/build_language.yml index 40a75f37..bea5a00a 100644 --- a/.github/workflows/build_language.yml +++ b/.github/workflows/build_language.yml @@ -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: |