Skip to content

Commit 0070c26

Browse files
committed
ZJIT: CI: Use Rust version built into GitHub Actions image
Saves the work of installing Rust for most jobs. Keep a job on each platform that tests 1.85.0, the minimum supported version, though.
1 parent 4da569b commit 0070c26

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

.github/workflows/zjit-macos.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
include:
3535
- test_task: 'zjit-check'
3636
configure: '--enable-yjit=dev --enable-zjit'
37+
rust_version: "1.85.0"
3738

3839
- test_task: 'ruby' # build test for combo build
3940
configure: '--enable-yjit --enable-zjit'
@@ -81,14 +82,17 @@ jobs:
8182
# Set fetch-depth: 10 so that Launchable can receive commits information.
8283
fetch-depth: 10
8384

85+
- name: Install Rust
86+
if: ${{ matrix.rust_version }}
87+
run: |
88+
rustup install ${{ matrix.rust_version }} --profile minimal
89+
rustup default ${{ matrix.rust_version }}
90+
8491
- uses: taiki-e/install-action@v2
8592
with:
8693
tool: nextest@0.9
8794
if: ${{ matrix.test_task == 'zjit-check' }}
8895

89-
- name: Install Rust # TODO(alan): remove when GitHub images catch up past 1.85.0
90-
run: rustup default 1.85.0
91-
9296
- name: Run configure
9397
run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
9498

.github/workflows/zjit-ubuntu.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939

4040
- test_task: 'zjit-check'
4141
configure: '--enable-yjit --enable-zjit=dev'
42+
rust_version: '1.85.0'
4243

4344
- test_task: 'zjit-test-all'
4445
configure: '--enable-zjit=dev'
@@ -98,7 +99,10 @@ jobs:
9899
fetch-depth: 10
99100

100101
- name: Install Rust
101-
run: rustup default 1.85.0
102+
if: ${{ matrix.rust_version }}
103+
run: |
104+
rustup install ${{ matrix.rust_version }} --profile minimal
105+
rustup default ${{ matrix.rust_version }}
102106
103107
- name: Install rustfmt
104108
if: ${{ matrix.test_task == 'zjit-bindgen' }}

0 commit comments

Comments
 (0)