From b8a677c3c1ca529ee09d95953894ebe26de75a28 Mon Sep 17 00:00:00 2001 From: Zephyron Date: Sat, 20 Sep 2025 20:39:54 +1000 Subject: [PATCH] ci: Fix CMAKE_FLAGS by using direct cmake command - Remove the problematic CMAKE_FLAGS variable that was causing argument parsing issues - Put the cmake command directly in the script section with proper quotes - This resolves the 'Unknown argument -mtune=core2' CMake error - The YAML folded scalar was not properly separating the arguments - Back to the working inline approach that was successful before --- .gitlab-ci.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 027a197b0..16aac226a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,21 +9,6 @@ variables: CMAKE_BUILD_PARALLEL_LEVEL: "4" DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" - # Define CMAKE_FLAGS here to avoid YAML parsing issues - CMAKE_FLAGS: > - -GNinja - -DCITRON_ENABLE_LTO=ON - -DCITRON_USE_BUNDLED_VCPKG=ON - -DCITRON_TESTS=OFF - -DCITRON_USE_LLVM_DEMANGLE=OFF - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_CXX_FLAGS=-march=core2 -mtune=core2 -Wno-error - -DCMAKE_C_FLAGS=-march=core2 -mtune=core2 - -DUSE_DISCORD_PRESENCE=OFF - -DBUNDLE_SPEEX=ON - -DCMAKE_SYSTEM_PROCESSOR=x86_64 - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 # Cache configuration for faster builds cache: @@ -66,7 +51,7 @@ build-linux: script: - git submodule update --init --recursive - mkdir -p build && cd build - - cmake .. $CMAKE_FLAGS + - cmake .. -GNinja -DCITRON_ENABLE_LTO=ON -DCITRON_USE_BUNDLED_VCPKG=ON -DCITRON_TESTS=OFF -DCITRON_USE_LLVM_DEMANGLE=OFF -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_FLAGS="-march=core2 -mtune=core2 -Wno-error" -DCMAKE_C_FLAGS="-march=core2 -mtune=core2" -DUSE_DISCORD_PRESENCE=OFF -DBUNDLE_SPEEX=ON -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5 - ninja - cd .. - echo "Build completed, checking for executables..."