Skip to content

Commit 359b0d8

Browse files
committed
use x86_64 without LLVM and prefer precompiled rustc
Signed-off-by: onur-ozkan <[email protected]>
1 parent 3d5528c commit 359b0d8

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.github/workflows/ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ jobs:
5858
- name: mingw-check-tidy
5959
os: ubuntu-20.04-4core-16gb
6060
env: {}
61-
- name: x86_64-gnu-llvm-17
61+
- name: x86_64-gnu
6262
env:
6363
ENABLE_GCC_CODEGEN: "1"
64+
DOWNLOAD_RUSTC: "1"
6465
os: ubuntu-20.04-16core-64gb
6566
- name: x86_64-gnu-tools
6667
os: ubuntu-20.04-16core-64gb
@@ -294,8 +295,9 @@ jobs:
294295
os: ubuntu-20.04-8core-32gb
295296
env: {}
296297
- name: x86_64-gnu
298+
env:
299+
DOWNLOAD_RUSTC: "1"
297300
os: ubuntu-20.04-4core-16gb
298-
env: {}
299301
- name: x86_64-gnu-stable
300302
env:
301303
IMAGE: x86_64-gnu

src/ci/docker/run.sh

+5
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,11 @@ if [ "$ENABLE_GCC_CODEGEN" = "1" ]; then
310310
echo "Setting extra environment values for docker: $extra_env"
311311
fi
312312

313+
if [ "$DOWNLOAD_RUSTC" = "1" ]; then
314+
extra_env="$extra_env --env DOWNLOAD_RUSTC=1"
315+
echo "Setting extra environment values for docker: $extra_env"
316+
fi
317+
313318
docker \
314319
run \
315320
--workdir /checkout/obj \

src/ci/github-actions/ci.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,10 @@ jobs:
357357
- name: mingw-check-tidy
358358
<<: *job-linux-4c
359359

360-
- name: x86_64-gnu-llvm-17
360+
- name: x86_64-gnu
361361
env:
362362
ENABLE_GCC_CODEGEN: "1"
363+
DOWNLOAD_RUSTC: "1"
363364
<<: *job-linux-16c
364365

365366
- name: x86_64-gnu-tools
@@ -476,6 +477,8 @@ jobs:
476477
<<: *job-linux-8c
477478

478479
- name: x86_64-gnu
480+
env:
481+
DOWNLOAD_RUSTC: "1"
479482
<<: *job-linux-4c
480483

481484
# This job ensures commits landing on nightly still pass the full

0 commit comments

Comments
 (0)