From 6f17005d0a22b41d917a3127e37ca84059a528f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Fri, 17 Nov 2023 15:38:39 +0100 Subject: [PATCH] Don't optimize GitHub Actions PR builds that don't get packaged. --- .github/workflows/master_build.yml | 2 +- .github/workflows/pr_build.yml | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index 9f60638974..60e5f47cfc 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -73,7 +73,7 @@ jobs: echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV # Transparently enable ccache echo "PATH=/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" >> $GITHUB_ENV - echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DOVERTE_OPTIMIZE=false -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV fi # Mac build variables if [ "${{ matrix.os }}" = "macOS-10.15" ]; then diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 40f6113e7b..8d48cd6d71 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -88,8 +88,6 @@ jobs: echo "PYTHON_EXEC=python3" >> $GITHUB_ENV echo "INSTALLER_EXT=*" >> $GITHUB_ENV echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV - # Don't optimize builds to save build time. - echo "OVERTE_OPTIMIZE=false" >> $GITHUB_ENV # Transparently enable ccache echo "PATH=/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" >> $GITHUB_ENV # Starting with Ubuntu 22.04 we can use system Qt @@ -100,18 +98,18 @@ jobs: if [[ "${{ matrix.arch }}" = "aarch64" ]]; then echo "VCPKG_FORCE_SYSTEM_BINARIES=true" >> $GITHUB_ENV if [ "${{ matrix.build_type }}" = "full" ]; then - echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DOVERTE_OPTIMIZE=false -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV else - echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DOVERTE_OPTIMIZE=false -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV fi fi if [[ "${{ matrix.arch }}" = "amd64" ]]; then if [ "${{ matrix.build_type }}" = "full" ]; then - echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DOVERTE_OPTIMIZE=false -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV else - echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV + echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DOVERTE_OPTIMIZE=false -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV fi fi fi