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,9 @@ # goal being to reduce the load on testers when a commit is known to fail. # +env: + LLVM_HEAD_VERSION: "15" + GCC_STABLE_VERSION: "12" steps: # # Light pre-commit tests for things like formatting or when people forget @@ -76,6 +79,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 +96,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 +113,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 +130,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -132,6 +147,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "gcc-${GCC_STABLE_VERSION}" + CXX: "gcc++-${GCC_STABLE_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -194,6 +212,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "gcc-${GCC_STABLE_VERSION}" + CXX: "gcc++-${GCC_STABLE_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -204,10 +225,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,7 +242,10 @@ timeout_in_minutes: 120 - label: "Clang 14" - command: "libcxx/utils/ci/run-buildbot generic-clang-14" + command: "libcxx/utils/ci/run-buildbot generic-cxx2b" + env: + CC: "clang-14" + CXX: "clang++-14" artifact_paths: - "**/test-results.xml" - "**/*.abilist" @@ -239,6 +266,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 +283,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 +300,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 +317,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 +351,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 +368,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 +386,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 +403,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 +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" @@ -383,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" @@ -397,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" @@ -411,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" @@ -427,6 +490,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 +507,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 +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" @@ -469,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" @@ -483,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" @@ -497,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" @@ -511,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" @@ -525,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" @@ -539,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" @@ -554,6 +644,9 @@ artifact_paths: - "**/test-results.xml" - "**/*.abilist" + env: + CC: "clang-${LLVM_HEAD_VERSION}" + CXX: "clang++-${LLVM_HEAD_VERSION}" agents: queue: "libcxx-builders" os: "linux" @@ -819,6 +912,8 @@ - "**/test-results.xml" - "**/*.abilist" env: + CC: "clang" + CXX: "clang++" OBJECT_MODE: "32" agents: queue: libcxx-builders @@ -835,6 +930,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 @@ -263,25 +263,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 \ @@ -289,8 +271,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 \ @@ -570,8 +550,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" \