From 631dfa500780584d35b1678d862f47b2220e1b9c Mon Sep 17 00:00:00 2001 From: Daniel Adler Date: Tue, 6 Aug 2024 14:16:15 +0200 Subject: [PATCH] CI:macOS exclude cmake "multiple-targets" projects for Xcode --- .github/workflows/ci.yml | 3 ++- .gitlab-ci.yml | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e4f49f..12043fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,8 @@ jobs: - if: matrix.os == 'ubuntu-22.04' run: cd test/standalone-cmake && cmake -DSINGLE="Unix Makefiles" -P test-cmake-generators.cmake - if: matrix.os == 'macos-12' - run: cd test/standalone-cmake && cmake -DMULTI="Xcode" -P test-cmake-generators.cmake + # Exclude cpp-*-multiple-targets test-projects for Xcode + run: cd test/standalone-cmake && cmake -DMULTI="Xcode" -DPROJECTS="cpp-flat;cpp-tree;cpp-multiple-schema-dirs" -P test-cmake-generators.cmake - name: Upload artifact uses: actions/upload-artifact@v4 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6df6b2..310c5c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,4 +56,8 @@ t:cmake:win-x64: t:cmake:mac-x64: tags: [ mac, x64 ] script: - - cd test/standalone-cmake && cmake -DAUTO=1 -DMULTI="Xcode" -P test-cmake-generators.cmake + - cd test/standalone-cmake + # Test using just make/ninja if found + - cmake -DAUTO=1 -P test-cmake-generators.cmake + # Test Xcode excluding multiple-targets test projects + - cmake -DMULTI="Xcode" -DPROJECTS="cpp-flat;cpp-tree;cpp-multiple-schema-dirs" -P test-cmake-generators.cmake