archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ZJIT: CI: Use Rust version built into GitHub Actions image

Browse source 
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.
This commit is contained in:
Alan Wu 2025-08-11 15:40:28 -04:00
parent 4da569b53e
commit 0070c26aec
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/zjit-macos.yml vendored
View file

@ -34,6 +34,7 @@ jobs:
include: include:
- test_task: 'zjit-check' - test_task: 'zjit-check'
configure: '--enable-yjit=dev --enable-zjit' configure: '--enable-yjit=dev --enable-zjit'
rust_version: "1.85.0"
- test_task: 'ruby' # build test for combo build - test_task: 'ruby' # build test for combo build
configure: '--enable-yjit --enable-zjit' configure: '--enable-yjit --enable-zjit'
@ -81,14 +82,17 @@ jobs:
# Set fetch-depth: 10 so that Launchable can receive commits information. # Set fetch-depth: 10 so that Launchable can receive commits information.
fetch-depth: 10 fetch-depth: 10
- name: Install Rust
if: ${{ matrix.rust_version }}
run: |
rustup install ${{ matrix.rust_version }} --profile minimal
rustup default ${{ matrix.rust_version }}
- uses: taiki-e/install-action@v2 - uses: taiki-e/install-action@v2
with: with:
tool: nextest@0.9 tool: nextest@0.9
if: ${{ matrix.test_task == 'zjit-check' }} if: ${{ matrix.test_task == 'zjit-check' }}
- name: Install Rust # TODO(alan): remove when GitHub images catch up past 1.85.0
run: rustup default 1.85.0
- name: Run configure - name: Run configure
run: ../src/configure -C --disable-install-doc ${{ matrix.configure }} run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}

6
.github/workflows/zjit-ubuntu.yml vendored
View file

@ -39,6 +39,7 @@ jobs:
- test_task: 'zjit-check' - test_task: 'zjit-check'
configure: '--enable-yjit --enable-zjit=dev' configure: '--enable-yjit --enable-zjit=dev'
rust_version: '1.85.0'
- test_task: 'zjit-test-all' - test_task: 'zjit-test-all'
configure: '--enable-zjit=dev' configure: '--enable-zjit=dev'
@ -98,7 +99,10 @@ jobs:
fetch-depth: 10 fetch-depth: 10
- name: Install Rust - name: Install Rust
run: rustup default 1.85.0 if: ${{ matrix.rust_version }}
run: |
rustup install ${{ matrix.rust_version }} --profile minimal
rustup default ${{ matrix.rust_version }}
- name: Install rustfmt - name: Install rustfmt
if: ${{ matrix.test_task == 'zjit-bindgen' }} if: ${{ matrix.test_task == 'zjit-bindgen' }}