Skip to content

Commit

Permalink
CI:macOS exclude cmake "multiple-targets" projects for Xcode
Browse files Browse the repository at this point in the history
  • Loading branch information
dan-obx committed Aug 7, 2024
1 parent 14053fa commit 631dfa5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 631dfa5

Please sign in to comment.