Browse Source

ci: Drop nightly job that builds CMake with vendored curl on macOS

Revert commit 31884a7146 (ci: Add nightly job to build CMake with
vendored curl on macOS, 2024-05-09, v3.30.0-rc1~130^2).  After
curl 8.15.0 dropped support for the Secure Transport backend, we
rely on the curl provided by macOS to use the system certificate
store.
master
Brad King 6 days ago
parent
commit
82ac700f78
  1. 21
      .gitlab-ci.yml
  2. 10
      .gitlab/ci/configure_macos_arm64_curl.cmake
  3. 7
      .gitlab/os-macos.yml

21
.gitlab-ci.yml

@ -948,16 +948,6 @@ b:macos-arm64-ninja-symlinked:
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:macos-arm64-curl:
extends:
- .macos_arm64_curl
- .cmake_build_macos
- .cmake_build_artifacts
- .macos_arm64_tags
- .run_manually
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:macos-arm64-pch:
extends:
- .macos_arm64_pch
@ -1005,17 +995,6 @@ t:macos-arm64-ninja-symlinked:
CMAKE_CI_JOB_NIGHTLY: "true"
CMAKE_CI_JOB_NIGHTLY_NINJA: "true"
t:macos-arm64-curl:
extends:
- .macos_arm64_curl
- .cmake_test_macos
- .macos_arm64_tags
- .run_dependent
needs:
- b:macos-arm64-curl
variables:
CMAKE_CI_JOB_NIGHTLY: "true"
b:macos-x86_64-makefiles:
extends:
- .macos_x86_64_makefiles

10
.gitlab/ci/configure_macos_arm64_curl.cmake

@ -1,10 +0,0 @@
# Build with our vendored curl instead of the default system version.
set(CMAKE_USE_SYSTEM_CURL "OFF" CACHE BOOL "")
set(CMake_TEST_TLS_VERIFY_URL "https://gitlab.kitware.com" CACHE STRING "")
set(CMake_TEST_TLS_VERIFY_URL_BAD "https://badtls-expired.kitware.com" CACHE STRING "")
set(CMake_TEST_TLS_VERSION "1.2" CACHE STRING "")
set(CMake_TEST_TLS_VERSION_URL_BAD "https://badtls-v1-1.kitware.com:8011" CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")

7
.gitlab/os-macos.yml

@ -49,13 +49,6 @@
CMAKE_CI_IN_SYMLINK_TREE: 1
CMAKE_CI_BUILD_DIR: "real_work/work/build"
.macos_arm64_curl:
extends: .macos_build
variables:
CMAKE_CONFIGURATION: macos_arm64_curl
CTEST_NO_WARNINGS_ALLOWED: 1
.macos_arm64_pch:
extends: .macos_arm64_ninja

Loading…
Cancel
Save