[libc++][CI] Increases the Clang version used.

Changes the CI to use the Clang 16 nightly builds instead of Clang 14.
(The libc++15 branch was accidentally build using Clang 14 instead of
Clang 15; hence the skipping of a number.)

Also adds a Clang 15 build to the test matrix.

Based on the private discussion with @ldionne we decided to move
the configuration parameters from the `run-buildbot` script to the
CI configuration `buildkite-pipeline.yml`. Other hard-coded values
from the Dockerfile should be move to the CI configuration too. That
will be done in another commit.

C++17 will use Clang-15 since D131479 causes a test to fail.

Reviewed By: ldionne, #libc

Differential Revision: https://reviews.llvm.org/D131174
This commit is contained in:
Mark de Wever 2022-08-04 17:29:25 +02:00
parent 69c20a1f49
commit ca04b49597
2 changed files with 138 additions and 26 deletions

View File

@ -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 @@ steps:
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 @@ steps:
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 @@ steps:
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 @@ steps:
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 @@ steps:
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 @@ steps:
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,12 @@ steps:
artifact_paths:
- "**/test-results.xml"
- "**/*.abilist"
env:
# TODO (mordante) use head
#CC: "clang-${LLVM_HEAD_VERSION}"
#CXX: "clang++-${LLVM_HEAD_VERSION}"
CC: "clang-15"
CXX: "clang++-15"
agents:
queue: "libcxx-builders"
os: "linux"
@ -179,6 +211,9 @@ steps:
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 +224,14 @@ steps:
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 +242,13 @@ steps:
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 +259,30 @@ steps:
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 +300,9 @@ steps:
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 +317,9 @@ steps:
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 +334,9 @@ steps:
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 +351,9 @@ steps:
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 +369,9 @@ steps:
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 +388,9 @@ steps:
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 +405,9 @@ steps:
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 +423,9 @@ steps:
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 +440,9 @@ steps:
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 +457,9 @@ steps:
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 +474,9 @@ steps:
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 +491,9 @@ steps:
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 +508,9 @@ steps:
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 +527,9 @@ steps:
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 +544,9 @@ steps:
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 +561,9 @@ steps:
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 +578,9 @@ steps:
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 +595,9 @@ steps:
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 +612,9 @@ steps:
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 +629,9 @@ steps:
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 +646,9 @@ steps:
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 +663,9 @@ steps:
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 +681,9 @@ steps:
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 +975,8 @@ steps:
- "**/test-results.xml"
- "**/*.abilist"
env:
CC: "clang"
CXX: "clang++"
OBJECT_MODE: "32"
agents:
queue: libcxx-builders
@ -861,6 +993,8 @@ steps:
- "**/test-results.xml"
- "**/*.abilist"
env:
CC: "clang"
CXX: "clang++"
OBJECT_MODE: "64"
agents:
queue: libcxx-builders

View File

@ -271,25 +271,7 @@ generic-merged)
-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 @@ generic-gcc)
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 @@ mingw-dll-i686)
${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" \