diff options
| author | Alan Wu <[email protected]> | 2025-02-20 19:42:28 -0500 |
|---|---|---|
| committer | Takashi Kokubun <[email protected]> | 2025-04-18 21:52:59 +0900 |
| commit | bd0f63507dd2e34caeb27be8eff92b08b44e7f69 (patch) | |
| tree | dc03d6d02b54e20b01e3aff07ce3dde667cc7082 | |
| parent | b8f49888a4030a29437cef9491078258df45ee77 (diff) | |
Use rustup to get 1.85.0 since GitHub's image doesn't have it
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/13131
| -rw-r--r-- | .github/workflows/zjit-macos.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/zjit-ubuntu.yml | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/.github/workflows/zjit-macos.yml b/.github/workflows/zjit-macos.yml index 6782e1a14b..f62af9f5b9 100644 --- a/.github/workflows/zjit-macos.yml +++ b/.github/workflows/zjit-macos.yml @@ -28,16 +28,19 @@ jobs: include: - test_task: 'zjit-test' configure: '--enable-zjit=dev' + rust_version: 1.85.0 - test_task: 'btest' zjit_opts: '--zjit-call-threshold=1' configure: '--enable-zjit=dev' btests: '../src/bootstraptest/test_zjit.rb' + rust_version: 1.85.0 - test_task: 'check' # Test without ZJIT for now #zjit_opts: '--zjit-call-threshold=1' configure: '--enable-zjit' + rust_version: 1.85.0 env: GITPULLOPTIONS: --no-tags origin ${{ github.ref }} @@ -79,6 +82,10 @@ jobs: tool: [email protected] if: ${{ matrix.test_task == 'zjit-test' }} + - name: Install Rust # TODO(alan): remove when GitHub images catch up past 1.85.0 + if: ${{ matrix.rust_version }} + run: rustup default ${{ matrix.rust_version }} + - name: Run configure run: ../src/configure -C --disable-install-doc ${{ matrix.configure }} diff --git a/.github/workflows/zjit-ubuntu.yml b/.github/workflows/zjit-ubuntu.yml index c968df4319..18f1a2f082 100644 --- a/.github/workflows/zjit-ubuntu.yml +++ b/.github/workflows/zjit-ubuntu.yml @@ -32,19 +32,23 @@ jobs: hint: 'To fix: use patch in logs' configure: '--enable-zjit=dev --with-gcc=clang-14' libclang_path: '/usr/lib/llvm-14/lib/libclang.so.1' + rust_version: 1.85.0 # TODO(alan): remove when GitHub's images catch up - test_task: 'zjit-test' configure: '--enable-zjit=dev' + rust_version: 1.85.0 - test_task: 'btest' zjit_opts: '--zjit-call-threshold=1' configure: '--enable-zjit=dev' btests: '../src/bootstraptest/test_zjit.rb' + rust_version: 1.85.0 - test_task: 'check' # Test without ZJIT for now #zjit_opts: '--zjit-call-threshold=1' configure: '--enable-zjit' + rust_version: 1.85.0 env: GITPULLOPTIONS: --no-tags origin ${{ github.ref }} @@ -97,7 +101,11 @@ jobs: - name: Install Rust if: ${{ matrix.rust_version }} - run: rustup install ${{ matrix.rust_version }} --profile minimal + run: rustup default ${{ matrix.rust_version }} + + - name: Install rustfmt + if: ${{ matrix.test_task == 'zjit-bindgen' }} + run: rustup component add rustfmt - name: Run configure run: ../src/configure -C --disable-install-doc --prefix=$(pwd)/install ${{ matrix.configure }} |