diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml --- a/libcxx/utils/ci/buildkite-pipeline.yml +++ b/libcxx/utils/ci/buildkite-pipeline.yml @@ -17,6 +17,14 @@ # goal being to reduce the load on testers when a commit is known to fail. # +# The Linux CI runners use the nightly ToT build provided by the Docker image. +# (Note the image isn't updated daily.) The LLVM_HEAD_VERSION contains that +# version number. The Linux CI runners for GCC use the latest stable version. +# Theses numbers are available in all runners, making it easier to update the +# version number. +env: + LLVM_HEAD_VERSION: "16" + GCC_STABLE_VERSION: "12" steps: # # Light pre-commit tests for things like formatting or when people forget @@ -76,6 +84,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -90,6 +101,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -104,6 +118,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -118,6 +135,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -127,11 +147,14 @@ limit: 2 timeout_in_minutes: 120 - - label: "GCC 12 / C++latest" + - label: "GCC ${GCC_STABLE_VERSION} / C++latest" command: "libcxx/utils/ci/run-buildbot generic-gcc" artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "gcc-${GCC_STABLE_VERSION}" + CXX: "g++-${GCC_STABLE_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -151,6 +174,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -165,6 +191,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -179,6 +208,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -189,11 +221,14 @@ timeout_in_minutes: 120 # Tests with the supported compilers. - - label: "GCC 12 / C++11" + - label: "GCC ${GCC_STABLE_VERSION} / C++11" command: "libcxx/utils/ci/run-buildbot generic-gcc-cxx11" artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "gcc-${GCC_STABLE_VERSION}" + CXX: "g++-${GCC_STABLE_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -204,10 +239,13 @@ timeout_in_minutes: 120 - label: "Clang 13" - command: "libcxx/utils/ci/run-buildbot generic-clang-13" + command: "libcxx/utils/ci/run-buildbot generic-cxx2b" artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-13" + CXX: "clang++-13" agents: queue: "libcxx-builders" os: "linux" @@ -218,10 +256,30 @@ timeout_in_minutes: 120 - label: "Clang 14" - command: "libcxx/utils/ci/run-buildbot generic-clang-14" + command: "libcxx/utils/ci/run-buildbot generic-cxx2b" + artifact_paths: + - "**/test-results.xml" + - "**/*.abilist" + env: + CC: "clang-14" + CXX: "clang++-14" + agents: + queue: "libcxx-builders" + os: "linux" + retry: + automatic: + - exit_status: -1 # Agent was lost + limit: 2 + timeout_in_minutes: 120 + + - label: "Clang 15" + command: "libcxx/utils/ci/run-buildbot generic-cxx2b" artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-15" + CXX: "clang++-15" agents: queue: "libcxx-builders" os: "linux" @@ -239,6 +297,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -253,6 +314,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -267,6 +331,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -281,6 +348,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -296,6 +366,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -312,6 +385,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -326,6 +402,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -341,6 +420,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -355,6 +437,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -369,6 +454,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -383,6 +471,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -397,6 +488,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -411,6 +505,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -427,6 +524,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -441,6 +541,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -455,6 +558,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -469,6 +575,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -483,6 +592,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -497,6 +609,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -511,6 +626,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -525,6 +643,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -539,6 +660,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -554,6 +678,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -845,6 +972,8 @@ - "**/test-results.xml" - "**/*.abilist" env: + CC: "clang" + CXX: "clang++" OBJECT_MODE: "32" agents: queue: libcxx-builders @@ -861,6 +990,8 @@ - "**/test-results.xml" - "**/*.abilist" env: + CC: "clang" + CXX: "clang++" OBJECT_MODE: "64" agents: queue: libcxx-builders diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -271,25 +271,7 @@ -DLIBUNWIND_TEST_CONFIG="llvm-libunwind-merged.cfg.in" check-runtimes ;; -generic-clang-13) - export CC=clang-13 - export CXX=clang++-13 - clean - generate-cmake - check-runtimes - check-abi-list -;; -generic-clang-14) - export CC=clang-14 - export CXX=clang++-14 - clean - generate-cmake - check-runtimes - check-abi-list -;; generic-gcc) - export CC=gcc-12 - export CXX=g++-12 clean generate-cmake -DLIBCXX_ENABLE_WERROR=NO \ -DLIBCXXABI_ENABLE_WERROR=NO \ @@ -297,8 +279,6 @@ check-runtimes ;; generic-gcc-cxx11) - export CC=gcc-12 - export CXX=g++-12 clean generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-cxx11.cmake" \ -DLIBCXX_ENABLE_WERROR=NO \ @@ -631,8 +611,6 @@ ${NINJA} -vC "${BUILD_DIR}" check-cxx ;; aix) - export CC=clang - export CXX=clang++ clean generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AIX.cmake" \ -DLIBCXX_TEST_CONFIG="ibm-libc++-shared.cfg.in" \