From 3599c311079435b8447c5eaed4e515fa04ce579f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 29 Mar 2025 10:07:40 +0100 Subject: [PATCH] Specify which build preset to use. --- .github/workflows/master_build.yml | 10 ++++------ .github/workflows/pr_build.yml | 10 ++++------ .github/workflows/release_build.yml | 8 +++----- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index dbb247266b..26eea48481 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -34,6 +34,9 @@ env: # WIN-specific variables PreferredToolArchitecture: X64 + # Specify build preset, since on Windows, `cmake --build` appears to be unaware of of which build preset to use, using defaults instead. + CMAKE_BUILD_EXTRA: --preset conan-release + jobs: build: name: "${{matrix.os}}" @@ -74,7 +77,7 @@ jobs: echo "CONAN_CPPSTD=gnu17" >> $GITHUB_ENV echo "PYTHON_EXEC=python3" >> $GITHUB_ENV echo "INSTALLER_EXT=tgz" >> $GITHUB_ENV - echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV + echo "CMAKE_BUILD_EXTRA=$CMAKE_BUILD_EXTRA -- -j$(nproc)" >> $GITHUB_ENV echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV fi # Mac build variables @@ -210,27 +213,22 @@ jobs: run: cmake --preset conan-default -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA - name: Build application - working-directory: ${{runner.workspace}}/build shell: bash run: cmake --build . --target $APP_TARGET_NAME $CMAKE_BUILD_EXTRA - name: Build domain server - working-directory: ${{runner.workspace}}/build shell: bash run: cmake --build . --target domain-server $CMAKE_BUILD_EXTRA - name: Build assignment client - working-directory: ${{runner.workspace}}/build shell: bash run: cmake --build . --target assignment-client $CMAKE_BUILD_EXTRA - name: Build console - working-directory: ${{runner.workspace}}/build shell: bash run: cmake --build . --target packaged-server-console $CMAKE_BUILD_EXTRA - name: Build installer - working-directory: ${{runner.workspace}}/build shell: bash run: | echo "Retry code from https://unix.stackexchange.com/a/137639" diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 7b29e6d069..50752f08cb 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -39,6 +39,9 @@ env: # Ensure XZ always runs with muticore support XZ_OPT: -T0 + # Specify build preset, since on Windows, `cmake --build` appears to be unaware of of which build preset to use, using defaults instead. + CMAKE_BUILD_EXTRA: --preset conan-release + jobs: build_pr: name: "${{matrix.os}}, ${{matrix.arch}}" @@ -102,7 +105,7 @@ jobs: echo "CONAN_CPPSTD=gnu17" >> $GITHUB_ENV echo "PYTHON_EXEC=python3" >> $GITHUB_ENV echo "INSTALLER_EXT=*" >> $GITHUB_ENV - echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV + echo "CMAKE_BUILD_EXTRA=$CMAKE_BUILD_EXTRA -- -j$(nproc)" >> $GITHUB_ENV # Don't optimize builds to save build time. echo "OVERTE_OPTIMIZE=false" >> $GITHUB_ENV # Starting with Ubuntu 22.04 we can use system Qt @@ -282,32 +285,27 @@ jobs: - name: Build Application if: matrix.build_type == 'full' || matrix.build_type == 'client' - working-directory: build shell: bash run: cmake --build . --target $APP_TARGET_NAME $CMAKE_BUILD_EXTRA - name: Build Domain Server if: matrix.build_type == 'full' - working-directory: build shell: bash run: cmake --build . --target domain-server $CMAKE_BUILD_EXTRA - name: Build Assignment Client if: matrix.build_type == 'full' - working-directory: build shell: bash run: cmake --build . --target assignment-client $CMAKE_BUILD_EXTRA - name: Build Console if: matrix.build_type == 'full' && matrix.arch != 'aarch64' || startsWith(matrix.os, 'windows') - working-directory: build shell: bash run: | cmake --build . --target packaged-server-console $CMAKE_BUILD_EXTRA - name: Build Installer if: matrix.build_type != 'android' && matrix.arch != 'aarch64' - working-directory: build shell: bash run: | echo "Retry code from https://unix.stackexchange.com/a/137639" diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 5b0f9ff291..8fdd9939eb 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -30,6 +30,9 @@ env: # WIN-specific variables PreferredToolArchitecture: X64 + # Specify build preset, since on Windows, `cmake --build` appears to be unaware of of which build preset to use, using defaults instead. + CMAKE_BUILD_EXTRA: --preset conan-release + jobs: build: name: "${{matrix.os}}" @@ -131,27 +134,22 @@ jobs: run: cmake --preset conan-${BUILD_TYPE,,} -DJSDOC_ENABLED:BOOL=TRUE -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA - name: Build application - working-directory: ${{runner.workspace}}/build shell: bash run: cmake --build . --target $APP_TARGET_NAME $CMAKE_BUILD_EXTRA - name: Build domain server - working-directory: ${{runner.workspace}}/build shell: bash run: cmake --build . --target domain-server $CMAKE_BUILD_EXTRA - name: Build assignment client - working-directory: ${{runner.workspace}}/build shell: bash run: cmake --build . --target assignment-client $CMAKE_BUILD_EXTRA - name: Build console - working-directory: ${{runner.workspace}}/build shell: bash run: cmake --build . --target packaged-server-console $CMAKE_BUILD_EXTRA - name: Build installer - working-directory: ${{runner.workspace}}/build shell: bash run: | echo "Retry code from https://unix.stackexchange.com/a/137639"