use x86_64 without LLVM and prefer precompiled rustc

Signed-off-by: onur-ozkan <work@onurozkan.dev>
rust-lang · Apr 1, 2024 · 359b0d8 · 359b0d8
1 parent 3d5528c
commit 359b0d8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,9 +58,10 @@ jobs:
  - name: mingw-check-tidy
  os: ubuntu-20.04-4core-16gb
  env: {}
- - name: x86_64-gnu-llvm-17
+ - name: x86_64-gnu
  env:
  ENABLE_GCC_CODEGEN: "1"
+ DOWNLOAD_RUSTC: "1"
  os: ubuntu-20.04-16core-64gb
  - name: x86_64-gnu-tools
  os: ubuntu-20.04-16core-64gb
@@ -294,8 +295,9 @@ jobs:
  os: ubuntu-20.04-8core-32gb
  env: {}
  - name: x86_64-gnu
+ env:
+ DOWNLOAD_RUSTC: "1"
  os: ubuntu-20.04-4core-16gb
- env: {}
  - name: x86_64-gnu-stable
  env:
  IMAGE: x86_64-gnu

diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
@@ -310,6 +310,11 @@ if [ "$ENABLE_GCC_CODEGEN" = "1" ]; then
  echo "Setting extra environment values for docker: $extra_env"
 fi
 
+if [ "$DOWNLOAD_RUSTC" = "1" ]; then
+ extra_env="$extra_env --env DOWNLOAD_RUSTC=1"
+ echo "Setting extra environment values for docker: $extra_env"
+fi
+
 docker \
  run \
  --workdir /checkout/obj \

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
@@ -357,9 +357,10 @@ jobs:
  - name: mingw-check-tidy
  <<: *job-linux-4c
 
- - name: x86_64-gnu-llvm-17
+ - name: x86_64-gnu
  env:
  ENABLE_GCC_CODEGEN: "1"
+ DOWNLOAD_RUSTC: "1"
  <<: *job-linux-16c
 
  - name: x86_64-gnu-tools
@@ -476,6 +477,8 @@ jobs:
  <<: *job-linux-8c
 
  - name: x86_64-gnu
+ env:
+ DOWNLOAD_RUSTC: "1"
  <<: *job-linux-4c
 
  # This job ensures commits landing on nightly still pass the full