Skip to content

Commit ba9b150

Browse files
committed
[libc++][ci] Add a job to run the vanilla configuration on Apple
Previously, we'd only have jobs testing the Apple cache on Apple platforms, but libc++ should also work out-of-the-box.
1 parent 686eb0d commit ba9b150

File tree

2 files changed

+31
-26
lines changed

2 files changed

+31
-26
lines changed

libcxx/utils/ci/buildkite-pipeline.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,65 +16,70 @@
1616

1717
steps:
1818
- label: "C++03"
19-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-cxx03 | libcxx/utils/ci/phabricator-report"
19+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-cxx03 | libcxx/utils/ci/phabricator-report"
2020
agents:
2121
queue: "libcxx-builders"
2222

2323
- label: "C++11"
24-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-cxx11 | libcxx/utils/ci/phabricator-report"
24+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-cxx11 | libcxx/utils/ci/phabricator-report"
2525
agents:
2626
queue: "libcxx-builders"
2727

2828
- label: "C++14"
29-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-cxx14 | libcxx/utils/ci/phabricator-report"
29+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-cxx14 | libcxx/utils/ci/phabricator-report"
3030
agents:
3131
queue: "libcxx-builders"
3232

3333
- label: "C++17"
34-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-cxx17 | libcxx/utils/ci/phabricator-report"
34+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-cxx17 | libcxx/utils/ci/phabricator-report"
3535
agents:
3636
queue: "libcxx-builders"
3737

3838
- label: "C++20"
39-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-cxx2a | libcxx/utils/ci/phabricator-report"
39+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-cxx2a | libcxx/utils/ci/phabricator-report"
4040
agents:
4141
queue: "libcxx-builders"
4242

4343
- label: "-fno-exceptions"
44-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-noexceptions | libcxx/utils/ci/phabricator-report"
44+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-noexceptions | libcxx/utils/ci/phabricator-report"
4545
agents:
4646
queue: "libcxx-builders"
4747

4848
- label: "GCC/C++20"
49-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-gcc | libcxx/utils/ci/phabricator-report"
49+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-gcc | libcxx/utils/ci/phabricator-report"
5050
agents:
5151
queue: "libcxx-builders"
5252

5353
- label: "ASAN"
54-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-asan | libcxx/utils/ci/phabricator-report"
54+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-asan | libcxx/utils/ci/phabricator-report"
5555
agents:
5656
queue: "libcxx-builders"
5757

5858
- label: "TSAN"
59-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-tsan | libcxx/utils/ci/phabricator-report"
59+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-tsan | libcxx/utils/ci/phabricator-report"
6060
agents:
6161
queue: "libcxx-builders"
6262

6363
- label: "UBSAN"
64-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-ubsan | libcxx/utils/ci/phabricator-report"
64+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-ubsan | libcxx/utils/ci/phabricator-report"
6565
agents:
6666
queue: "libcxx-builders"
6767

6868
- label: "With LLVM's libunwind"
69-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-with_llvm_unwinder | libcxx/utils/ci/phabricator-report"
69+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-with_llvm_unwinder | libcxx/utils/ci/phabricator-report"
7070
agents:
7171
queue: "libcxx-builders"
7272

7373
- label: "Single-threaded"
74-
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-ubuntu-singlethreaded | libcxx/utils/ci/phabricator-report"
74+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-singlethreaded | libcxx/utils/ci/phabricator-report"
7575
agents:
7676
queue: "libcxx-builders"
7777

78+
- label: "MacOS C++20"
79+
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-cxx2a | libcxx/utils/ci/phabricator-report"
80+
agents:
81+
queue: "libcxx-macos-builders"
82+
7883
# Build with the configuration we use to generate libc++.dylib on Apple platforms
7984
- label: "Apple system"
8085
command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh x86_64-apple-system | libcxx/utils/ci/phabricator-report"

libcxx/utils/ci/run-buildbot.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,83 +18,83 @@ args+=("-DLLVM_ENABLE_PROJECTS=libcxx;libunwind;libcxxabi")
1818
args+=("-DLIBCXX_CXX_ABI=libcxxabi")
1919

2020
case "${BUILDER}" in
21-
x86_64-ubuntu-cxx03)
21+
generic-cxx03)
2222
export CC=clang
2323
export CXX=clang++
2424
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --param=std=c++03")
2525
;;
26-
x86_64-ubuntu-cxx11)
26+
generic-cxx11)
2727
export CC=clang
2828
export CXX=clang++
2929
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --param=std=c++11")
3030
;;
31-
x86_64-ubuntu-cxx14)
31+
generic-cxx14)
3232
export CC=clang
3333
export CXX=clang++
3434
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --param=std=c++14")
3535
;;
36-
x86_64-ubuntu-cxx17)
36+
generic-cxx17)
3737
export CC=clang
3838
export CXX=clang++
3939
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --param=std=c++17")
4040
;;
41-
x86_64-ubuntu-cxx2a)
41+
generic-cxx2a)
4242
export CC=clang
4343
export CXX=clang++
4444
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --param=std=c++2a")
4545
;;
46-
x86_64-ubuntu-noexceptions)
46+
generic-noexceptions)
4747
export CC=clang
4848
export CXX=clang++
4949
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported")
5050
args+=("-DLIBCXX_ENABLE_EXCEPTIONS=OFF")
5151
args+=("-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF")
5252
;;
53-
x86_64-ubuntu-32bit)
53+
generic-32bit)
5454
export CC=clang
5555
export CXX=clang++
5656
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported")
5757
args+=("-DLLVM_BUILD_32_BITS=ON")
5858
;;
59-
x86_64-ubuntu-gcc)
59+
generic-gcc)
6060
export CC=gcc
6161
export CXX=g++
6262
# FIXME: Re-enable experimental testing on GCC. GCC cares about the order
6363
# in which we link -lc++experimental, which causes issues.
6464
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported --param enable_experimental=False")
6565
;;
66-
x86_64-ubuntu-asan)
66+
generic-asan)
6767
export CC=clang
6868
export CXX=clang++
6969
args+=("-DLLVM_USE_SANITIZER=Address")
7070
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported")
7171
;;
72-
x86_64-ubuntu-msan)
72+
generic-msan)
7373
export CC=clang
7474
export CXX=clang++
7575
args+=("-DLLVM_USE_SANITIZER=MemoryWithOrigins")
7676
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported")
7777
;;
78-
x86_64-ubuntu-tsan)
78+
generic-tsan)
7979
export CC=clang
8080
export CXX=clang++
8181
args+=("-DLLVM_USE_SANITIZER=Thread")
8282
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported")
8383
;;
84-
x86_64-ubuntu-ubsan)
84+
generic-ubsan)
8585
export CC=clang
8686
export CXX=clang++
8787
args+=("-DLLVM_USE_SANITIZER=Undefined")
8888
args+=("-DLIBCXX_ABI_UNSTABLE=ON")
8989
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported")
9090
;;
91-
x86_64-ubuntu-with_llvm_unwinder)
91+
generic-with_llvm_unwinder)
9292
export CC=clang
9393
export CXX=clang++
9494
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported")
9595
args+=("-DLIBCXXABI_USE_LLVM_UNWINDER=ON")
9696
;;
97-
x86_64-ubuntu-singlethreaded)
97+
generic-singlethreaded)
9898
export CC=clang
9999
export CXX=clang++
100100
args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported")

0 commit comments

Comments
 (0)