Skip to content

Commit 37d6f91

Browse files
committed
fixup! [rust] Add CI Checks to Rust fork
1 parent 9a1f898 commit 37d6f91

File tree

1 file changed

+17
-48
lines changed

1 file changed

+17
-48
lines changed

.github/workflows/rust-premerge.yaml

Lines changed: 17 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
premerge-checks-linux:
2727
name: Build and Test Linux
2828
if: >-
29-
github.repository_owner == 'rust-lang' &&
30-
(github.event_name != 'pull_request' || github.event.action != 'closed')
29+
github.repository_owner == 'rust-lang' &&
30+
(github.event_name != 'pull_request' || github.event.action != 'closed')
3131
runs-on: ubuntu-24.04
3232
steps:
3333
- name: Checkout LLVM
@@ -41,28 +41,16 @@ jobs:
4141
run: |
4242
sudo apt-get update
4343
sudo apt-get install -y clang-18 cmake ninja-build
44-
- name: Setup ccache
45-
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
46-
with:
47-
max-size: "2000M"
4844
- name: Build and Test
4945
run: |
50-
projects_to_build='llvm;lld'
51-
project_check_targets='check-llvm check-lld'
52-
runtimes_to_build=''
53-
runtimes_check_targets=''
54-
runtimes_check_targets_needs_reconfig=''
55-
56-
echo "Building projects: ${projects_to_build}"
57-
echo "Running project checks targets: ${project_check_targets}"
58-
echo "Building runtimes: ${runtimes_to_build}"
59-
echo "Running runtimes checks targets: ${runtimes_check_targets}"
60-
echo "Running runtimes checks requiring reconfiguring targets: ${runtimes_check_targets_needs_reconfig}"
61-
62-
export CC=/usr/bin/clang-18
63-
export CXX=/usr/bin/clang++-18
64-
65-
./.ci/monolithic-linux.sh "${projects_to_build}" "${project_check_targets}" "${runtimes_to_build}" "${runtimes_check_targets}" "${runtimes_check_targets_needs_reconfig}"
46+
cmake -S llvm -B build -G Ninja \
47+
-DLLVM_ENABLE_PROJECTS=lld \
48+
-DLLVM_ENABLE_ASSERTIONS=ON \
49+
-DLLVM_ENABLE_LLD=ON \
50+
-DCMAKE_BUILD_TYPE=Release \
51+
-DCMAKE_C_COMPILER=/usr/bin/clang-18 \
52+
-DCMAKE_CXX_COMPILER=/usr/bin/clang++-18
53+
ninja -C build check-llvm check-lld
6654
6755
premerge-check-macos:
6856
name: Build and Test macOS
@@ -75,31 +63,12 @@ jobs:
7563
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7664
with:
7765
fetch-depth: 1
78-
- name: Setup ccache
79-
uses: hendrikmuhs/ccache-action@a1209f81afb8c005c13b4296c32e363431bffea5 # v1.2.17
80-
with:
81-
max-size: "2000M"
8266
- name: Build and Test
8367
run: |
84-
projects_to_build='llvm'
85-
project_check_targets='check-llvm'
86-
87-
echo "Building projects: ${projects_to_build}"
88-
echo "Running project checks targets: ${project_check_targets}"
89-
90-
# -DLLVM_DISABLE_ASSEMBLY_FILES=ON is for
91-
# https://github.com/llvm/llvm-project/issues/81967
92-
# Disable sharding in lit so that the LIT_XFAIL environment var works.
93-
cmake -G Ninja \
94-
-B build \
95-
-S llvm \
96-
-DLLVM_ENABLE_PROJECTS="${projects_to_build}" \
97-
-DLLVM_DISABLE_ASSEMBLY_FILES=ON \
98-
-DCMAKE_BUILD_TYPE=Release \
99-
-DLLDB_INCLUDE_TESTS=OFF \
100-
-DLLVM_ENABLE_ASSERTIONS=ON \
101-
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
102-
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
103-
104-
# The libcxx tests fail, so we are skipping the runtime targets.
105-
ninja -C build ${project_check_targets}
68+
cmake -S llvm -B build -G Ninja \
69+
-DCMAKE_BUILD_TYPE=Release \
70+
-DLLDB_INCLUDE_TESTS=OFF \
71+
-DLLVM_ENABLE_ASSERTIONS=ON \
72+
-DCMAKE_C_COMPILER=/usr/bin/clang \
73+
-DCMAKE_CXX_COMPILER=/usr/bin/clang++
74+
ninja -C build check-llvm

0 commit comments

Comments
 (0)