From 0755c2ffbbf256f99967f9b30cdd5b4c12ee3477 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 19 Feb 2021 12:02:18 -0500 Subject: gitlab-ci: rename macos build and test jobs to macos-x86_64 This makes room for future equivalents for other architectures. The packaging jobs produce universal binaries, so leave them as-is. --- .gitlab-ci.yml | 46 +++++++++++------------ .gitlab/ci/configure_macos_makefiles.cmake | 3 -- .gitlab/ci/configure_macos_ninja.cmake | 3 -- .gitlab/ci/configure_macos_x86_64_makefiles.cmake | 3 ++ .gitlab/ci/configure_macos_x86_64_ninja.cmake | 3 ++ .gitlab/ci/configure_macos_x86_64_xcode.cmake | 2 + .gitlab/ci/configure_macos_xcode.cmake | 2 - .gitlab/os-macos.yml | 18 ++++----- 8 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 .gitlab/ci/configure_macos_makefiles.cmake delete mode 100644 .gitlab/ci/configure_macos_ninja.cmake create mode 100644 .gitlab/ci/configure_macos_x86_64_makefiles.cmake create mode 100644 .gitlab/ci/configure_macos_x86_64_ninja.cmake create mode 100644 .gitlab/ci/configure_macos_x86_64_xcode.cmake delete mode 100644 .gitlab/ci/configure_macos_xcode.cmake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a322aa6..c88aa34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -236,62 +236,62 @@ build:linux-aarch64-package: # macOS builds -build:macos-ninja: +build:macos-x86_64-ninja: extends: - - .macos_ninja + - .macos_x86_64_ninja - .cmake_build_macos - .cmake_build_artifacts - - .macos_builder_tags + - .macos_x86_64_builder_tags - .run_manually -test:macos-ninja: +test:macos-x86_64-ninja: extends: - - .macos_ninja + - .macos_x86_64_ninja - .cmake_test_macos - .cmake_test_artifacts - - .macos_builder_tags + - .macos_x86_64_builder_tags - .run_dependent dependencies: - - build:macos-ninja + - build:macos-x86_64-ninja needs: - - build:macos-ninja + - build:macos-x86_64-ninja -build:macos-makefiles: +build:macos-x86_64-makefiles: extends: - - .macos_makefiles + - .macos_x86_64_makefiles - .cmake_build_macos - .cmake_build_artifacts - - .macos_builder_tags + - .macos_x86_64_builder_tags - .run_manually -test:macos-makefiles: +test:macos-x86_64-makefiles: extends: - - .macos_makefiles + - .macos_x86_64_makefiles - .cmake_test_macos - - .macos_builder_tags + - .macos_x86_64_builder_tags - .run_dependent dependencies: - - build:macos-makefiles + - build:macos-x86_64-makefiles needs: - - build:macos-makefiles + - build:macos-x86_64-makefiles -test:macos-xcode: +test:macos-x86_64-xcode: extends: - - .macos_xcode + - .macos_x86_64_xcode - .cmake_test_macos_external - - .macos_builder_ext_tags + - .macos_x86_64_builder_ext_tags - .run_dependent dependencies: - - test:macos-ninja + - test:macos-x86_64-ninja needs: - - test:macos-ninja + - test:macos-x86_64-ninja build:macos-package: extends: - .macos_package - .cmake_build_macos_package - .cmake_release_artifacts - - .macos_builder_tags_package + - .macos_x86_64_builder_tags_package - .run_only_for_package dependencies: - prep:doc-package @@ -314,7 +314,7 @@ build:macos10.10-package: - .macos10.10_package - .cmake_build_macos_package - .cmake_release_artifacts - - .macos_builder_tags_package + - .macos_x86_64_builder_tags_package - .run_only_for_package dependencies: - prep:doc-package diff --git a/.gitlab/ci/configure_macos_makefiles.cmake b/.gitlab/ci/configure_macos_makefiles.cmake deleted file mode 100644 index f657d98..0000000 --- a/.gitlab/ci/configure_macos_makefiles.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_TEST_GUI "ON" CACHE BOOL "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_ninja.cmake b/.gitlab/ci/configure_macos_ninja.cmake deleted file mode 100644 index f657d98..0000000 --- a/.gitlab/ci/configure_macos_ninja.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_TEST_GUI "ON" CACHE BOOL "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_x86_64_makefiles.cmake b/.gitlab/ci/configure_macos_x86_64_makefiles.cmake new file mode 100644 index 0000000..f657d98 --- /dev/null +++ b/.gitlab/ci/configure_macos_x86_64_makefiles.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_GUI "ON" CACHE BOOL "") +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_x86_64_ninja.cmake b/.gitlab/ci/configure_macos_x86_64_ninja.cmake new file mode 100644 index 0000000..f657d98 --- /dev/null +++ b/.gitlab/ci/configure_macos_x86_64_ninja.cmake @@ -0,0 +1,3 @@ +set(CMake_TEST_GUI "ON" CACHE BOOL "") +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_x86_64_xcode.cmake b/.gitlab/ci/configure_macos_x86_64_xcode.cmake new file mode 100644 index 0000000..1b976d2 --- /dev/null +++ b/.gitlab/ci/configure_macos_x86_64_xcode.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_macos_xcode.cmake b/.gitlab/ci/configure_macos_xcode.cmake deleted file mode 100644 index 1b976d2..0000000 --- a/.gitlab/ci/configure_macos_xcode.cmake +++ /dev/null @@ -1,2 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 450bae7..a7f55a7 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -24,18 +24,18 @@ # could run at the same time, so we drop it. GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" -.macos_ninja: +.macos_x86_64_ninja: extends: .macos_build variables: - CMAKE_CONFIGURATION: macos_ninja + CMAKE_CONFIGURATION: macos_x86_64_ninja CTEST_NO_WARNINGS_ALLOWED: 1 -.macos_makefiles: +.macos_x86_64_makefiles: extends: .macos_build variables: - CMAKE_CONFIGURATION: macos_makefiles + CMAKE_CONFIGURATION: macos_x86_64_makefiles CTEST_NO_WARNINGS_ALLOWED: 1 CMAKE_GENERATOR: "Unix Makefiles" @@ -57,16 +57,16 @@ ### External testing -.macos_xcode: +.macos_x86_64_xcode: extends: .macos variables: - CMAKE_CONFIGURATION: macos_xcode + CMAKE_CONFIGURATION: macos_x86_64_xcode CMAKE_GENERATOR: Xcode ## Tags -.macos_builder_tags: +.macos_x86_64_builder_tags: tags: - cmake # Since this is a bare runner, pin to a project. - macos @@ -74,7 +74,7 @@ - xcode-12.3 - nonconcurrent -.macos_builder_tags_package: +.macos_x86_64_builder_tags_package: tags: - cmake # Since this is a bare runner, pin to a project. - macos @@ -83,7 +83,7 @@ - nonconcurrent - finder -.macos_builder_ext_tags: +.macos_x86_64_builder_ext_tags: tags: - cmake # Since this is a bare runner, pin to a project. - macos -- cgit v0.12