E577 [libc++] Switch to the new docker image in the CI (#185843) · llvm/llvm-project@18b70ce · GitHub
[go: up one dir, main page]
Skip to content

Commit 18b70ce

Browse files
philnik777philnik777
authored
[libc++] Switch to the new docker image in the CI (#185843)
This also simplifies the workflow file a bit and removes a redundant `generic-cxx26` configuration in stage 3.
1 parent a5aa136 commit 18b70ce

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

‎.github/workflows/libcxx-build-and-test.yaml‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ concurrency:
3636
jobs:
3737
stage1:
3838
if: github.repository_owner == 'llvm'
39-
runs-on: llvm-premerge-libcxx-runners
39+
runs-on: llvm-premerge-libcxx-next-runners
4040
continue-on-error: false
4141
strategy:
4242
fail-fast: false
@@ -73,7 +73,7 @@ jobs:
7373
**/crash_diagnostics/*
7474
stage2:
7575
if: github.repository_owner == 'llvm'
76-
runs-on: llvm-premerge-libcxx-runners
76+
runs-on: llvm-premerge-libcxx-next-runners
7777
needs: [ stage1 ]
7878
continue-on-error: false
7979
strategy:
@@ -118,6 +118,7 @@ jobs:
118118
**/crash_diagnostics/*
119119
stage3:
120120
if: github.repository_owner == 'llvm'
121+
runs-on: llvm-premerge-libcxx-next-runners
121122
needs: [ stage2 ]
122123
continue-on-error: false
123124
strategy:
@@ -146,24 +147,13 @@ jobs:
146147
'generic-no-rtti',
147148
'generic-optimized-speed',
148149
'generic-static',
150+
'generic-asan',
151+
'generic-asan-in-tests-only',
152+
'generic-tsan',
153+
'generic-ubsan',
154+
'generic-msan',
149155
'bootstrapping-build'
150156
]
151-
machine: [ 'llvm-premerge-libcxx-runners' ]
152-
include:
153-
- config: 'generic-cxx26'
154-
machine: llvm-premerge-libcxx-runners
155-
- config: 'generic-asan'
156-
machine: llvm-premerge-libcxx-runners
157-
- config: 'generic-asan-in-tests-only'
158-
machine: llvm-premerge-libcxx-runners
159-
- config: 'generic-tsan'
160-
machine: llvm-premerge-libcxx-runners
161-
- config: 'generic-ubsan'
162-
machine: llvm-premerge-libcxx-runners
163-
# Use a larger machine for MSAN to avoid timeout and memory allocation issues.
164-
- config: 'generic-msan'
165-
machine: llvm-premerge-libcxx-runners
166-
runs-on: ${{ matrix.machine }}
167157
steps:
168158
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
169159
- name: ${{ matrix.config }}

‎libcxx/test/libcxx/gdb/gdb_pretty_printer_test.sh.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ void mi_mode_test() {
732732
one_two_three_umap.insert({2, "two"});
733733
one_two_three_umap.insert({1, "one"});
734734
CompareListChildrenToChars(
735-
one_two_three_umap, R"([{"key": 3, "value": "three"}, {"key": 2, "value": "two"}, {"key": 1, "value": "one"}])");
735+
one_two_three_umap, R"([{"key": 1, "value": "one"}, {"key": 2, "value": "two"}, {"key": 3, "value": "three"}])");
736736

737737
std::deque<int> one_two_three_deque{1, 2, 3};
738738
CompareListChildrenToChars(one_two_three_deque, "[1, 2, 3]");

0 commit comments

Comments
 (0)
0