diff options
Diffstat (limited to '.gitlab/os-macos.yml')
| -rw-r--r-- | .gitlab/os-macos.yml | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index a79cc1575f..652a67abb0 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -90,7 +90,7 @@ ## Tags -.macos_x86_64_builder_tags: +.macos_x86_64_tags: tags: - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 @@ -98,7 +98,7 @@ - xcode-14.2 - nonconcurrent -.macos_x86_64_builder_tags_package: +.macos_x86_64_tags_package: tags: - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 @@ -107,7 +107,7 @@ - nonconcurrent - finder -.macos_x86_64_builder_ext_tags: +.macos_x86_64_tags_ext: tags: - cmake # Since this is a bare runner, pin to a project. - macos-x86_64 @@ -115,7 +115,7 @@ - xcode-14.2 - concurrent -.macos_arm64_builder_tags: +.macos_arm64_tags: tags: - cmake # Since this is a bare runner, pin to a project. - macos-arm64 @@ -123,7 +123,7 @@ - xcode-14.2 - nonconcurrent -.macos_arm64_builder_ext_tags: +.macos_arm64_tags_ext: tags: - cmake # Since this is a bare runner, pin to a project. - macos-arm64 @@ -143,7 +143,7 @@ - ninja --version # Download Qt - cmake -P .gitlab/ci/download_qt.cmake - - export CMAKE_PREFIX_PATH=$PWD/.gitlab/qt + - export CMAKE_PREFIX_PATH=$PWD/.gitlab/qt${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH} .cmake_build_macos: stage: build @@ -154,25 +154,14 @@ # Allow the server to already be running. - "sccache --start-server || :" - sccache --show-stats + - .gitlab/ci/pre_build.sh - ctest -VV -S .gitlab/ci/ctest_configure.cmake - ctest -VV -S .gitlab/ci/ctest_build.cmake + - .gitlab/ci/post_build.sh - sccache --show-stats interruptible: true -.cmake_build_macos_package: - stage: build - - script: - - *before_script_macos - - ctest -VV -S .gitlab/ci/ctest_configure.cmake - - ctest -VV -S .gitlab/ci/ctest_build.cmake - - cd build - - cpack -G TGZ - - cpack -G DragNDrop - - interruptible: true - .cmake_test_macos: stage: test |