Skip to content

Commit 0540bb5

Browse files
wkswks
authored
Bump dependencies after version 0.24 (mmtk#1105)
This PR updates Cargo crates dependencies and GitHub Actions dependencies after v0.24 was released, with two exceptions: - We do not update `criterion` because a later version unintentionally requires MSRV 1.74. The problem has been fixed in the upstream criterion repo, but has not been released, yet. - We replaced `actions-rs/toolchain` with manual invocations of `rustup` because `actions-rs/toolchain` is no longer maintained. For tasks that don't require a specific toolchain, we rely on `rustup` and `cargo` to automatically install the toolchain specified by the file `rust-toolchain` upon first invocation. Also disabled Clippy checks on Darwin because the `clippy` program itself randomly crashes on Darwin.
1 parent 5ab62f9 commit 0540bb5

19 files changed

+133
-133
lines changed

‎.github/scripts/ci-style.sh

+9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
export RUSTFLAGS="-D warnings -A unknown-lints"
44

5+
# --- Check format ---
6+
cargo fmt -- --check
7+
cargo fmt --manifest-path=macros/Cargo.toml -- --check
8+
9+
# All versions of Clippy randomly crash on Darwin. We disable Clippy tests for Darwin for now.
10+
if [[ $(uname) == "Darwin" ]]; then
11+
exit 0
12+
fi
13+
514
# Workaround the clippy issue on Rust 1.72: https://github.com/mmtk/mmtk-core/issues/929.
615
# If we are not testing with Rust 1.72, or there is no problem running the following clippy checks, we can remove this export.
716
CLIPPY_VERSION=$(cargo clippy --version)

‎.github/workflows/api-check.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,18 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout mmtk-core
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v4
2323
with:
2424
# Full git history needed
2525
fetch-depth: 0
2626

27-
# cargo-public-api can be built with the latest stable toolchain.
28-
- name: Install stable Rust toolchain
29-
uses: actions-rs/toolchain@v1
30-
with:
31-
toolchain: stable
32-
profile: minimal
33-
# make it the active toolchain
34-
override: true
35-
3627
# cargo-public-api needs a nightly toolchain installed in order to work.
3728
# It does not have to be the active toolchain.
3829
- name: Install nightly Rust toolchain
39-
uses: actions-rs/toolchain@v1
40-
with:
41-
toolchain: nightly
42-
profile: minimal
30+
run: rustup toolchain install nightly
4331

32+
# Show the Rust toolchain we are actually using
33+
- run: rustup show
4434
- run: cargo --version
4535
- run: cargo +nightly --version
4636

‎.github/workflows/auto-merge-inner.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444
shell: bash
4545

4646
- name: Checkout MMTk Core
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848
if: steps.check-input.outputs.skip == 'false'
4949
with:
5050
path: ${{ env.MMTK_CORE_WORK_DIR }}
5151
- name: Checkout repository
5252
if: steps.check-input.outputs.skip == 'false'
53-
uses: actions/checkout@v3
53+
uses: actions/checkout@v4
5454
with:
5555
repository: ${{ inputs.repo }}
5656
path: ${{ env.BINDING_WORK_DIR }}

‎.github/workflows/binding-tests-openjdk.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
runs-on: ubuntu-22.04
1919
steps:
2020
- name: Checkout MMTk Core
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
2222
with:
2323
path: mmtk-core
2424
- name: Checkout OpenJDK Binding
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
2626
with:
2727
repository: ${{ inputs.repo }}
2828
path: mmtk-openjdk

‎.github/workflows/cargo-msrv.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
msrv:
1818
runs-on: ubuntu-22.04
1919
steps:
20-
- uses: actions/checkout@v2
21-
- name: Install Rust toolchain
22-
uses: actions-rs/toolchain@v1
23-
with:
24-
toolchain: stable
25-
override: true
20+
- uses: actions/checkout@v4
21+
22+
# Show the Rust toolchain we are actually using
23+
- run: rustup show
24+
- run: cargo --version
25+
2626
- name: Install cargo-msrv
2727
run: cargo install cargo-msrv
2828
# Verify the MSRV defined in Cargo.toml

‎.github/workflows/cargo-publish.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ jobs:
1414
cargo-publish:
1515
runs-on: ubuntu-22.04
1616
steps:
17-
- uses: actions/checkout@v2
18-
- name: Install latest nightly
19-
uses: actions-rs/toolchain@v1
20-
with:
21-
components: rustfmt, clippy
22-
target: i686-unknown-linux-gnu
23-
# This overwrites the default toolchain with the toolchain specified above.
24-
override: true
17+
- uses: actions/checkout@v4
18+
19+
# Show the Rust toolchain we are actually using
20+
- run: rustup show
21+
- run: cargo --version
22+
2523
- name: Cargo login
2624
run: cargo login ${{ secrets.CI_CARGO_LOGIN }}
2725
- name: Publish sub crates

‎.github/workflows/extended-tests-bindings.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
if: contains(github.event.pull_request.labels.*.name, 'PR-extended-testing')
2626
steps:
2727
- name: Checkout MMTk Core
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v4
2929
with:
3030
path: mmtk-core
3131
- name: Checkout V8 Binding
32-
uses: actions/checkout@v2
32+
uses: actions/checkout@v4
3333
with:
3434
repository: ${{ needs.binding-refs.outputs.v8_binding_repo }}
3535
path: mmtk-v8
@@ -71,11 +71,11 @@ jobs:
7171
if: contains(github.event.pull_request.labels.*.name, 'PR-extended-testing')
7272
steps:
7373
- name: Checkout MMTk Core
74-
uses: actions/checkout@v2
74+
uses: actions/checkout@v4
7575
with:
7676
path: mmtk-core
7777
- name: Checkout JikesRVM Binding
78-
uses: actions/checkout@v2
78+
uses: actions/checkout@v4
7979
with:
8080
repository: ${{ needs.binding-refs.outputs.jikesrvm_binding_repo }}
8181
path: mmtk-jikesrvm
@@ -106,11 +106,11 @@ jobs:
106106
if: contains(github.event.pull_request.labels.*.name, 'PR-extended-testing')
107107
steps:
108108
- name: Checkout MMTk Core
109-
uses: actions/checkout@v2
109+
uses: actions/checkout@v4
110110
with:
111111
path: mmtk-core
112112
- name: Checkout Julia Binding
113-
uses: actions/checkout@v2
113+
uses: actions/checkout@v4
114114
with:
115115
repository: ${{ needs.binding-refs.outputs.julia_binding_repo }}
116116
path: mmtk-julia
@@ -154,12 +154,12 @@ jobs:
154154
DEBUG_LEVEL: ${{ matrix.debug-level }}
155155
steps:
156156
- name: Checkout MMTk Core
157-
uses: actions/checkout@v3
157+
uses: actions/checkout@v4
158158
with:
159159
path: mmtk-core
160160

161161
- name: Checkout MMTk Ruby binding
162-
uses: actions/checkout@v3
162+
uses: actions/checkout@v4
163163
with:
164164
repository: ${{ needs.binding-refs.outputs.ruby_binding_repo }}
165165
path: mmtk-ruby
@@ -175,7 +175,7 @@ jobs:
175175
working-directory: mmtk-ruby
176176

177177
- name: Checkout Ruby
178-
uses: actions/checkout@v3
178+
uses: actions/checkout@v4
179179
with:
180180
repository: ${{ steps.extract-ruby-revision.outputs.ruby_repo }}
181181
ref: ${{ steps.extract-ruby-revision.outputs.ruby_rev }}

‎.github/workflows/link-check.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ jobs:
99
check-broken-links-in-docs:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- name: Restore lychee cache
1414
uses: actions/cache@v3
1515
with:
1616
path: .lycheecache
1717
key: cache-lychee-${{ github.sha }}
1818
restore-keys: cache-lychee-
1919
- name: Check links in docs/*.md
20-
uses: lycheeverse/[email protected].0
20+
uses: lycheeverse/[email protected].3
2121
with:
2222
fail: true
2323
token: ${{ secrets.GITHUB_TOKEN }}
2424
args: --base docs --accept '200,201,202,203,204,429,500' --no-progress --cache --max-cache-age 1d './docs/**/*.md' --exclude https://users.cecs.anu.edu.au/~steveb/pubs/papers/**
2525
- name: Save lychee cache
26-
uses: actions/cache/save@v3
26+
uses: actions/cache/save@v4
2727
if: always()
2828
with:
2929
path: .lycheecache

‎.github/workflows/merge-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: 'Wait for status checks'
1515
id: waitforstatuschecks
1616
timeout-minutes: 120
17-
uses: "WyriHaximus/github-action-wait-for-status@v1.7.0"
17+
uses: "WyriHaximus/github-action-wait-for-status@v1.8.0"
1818
with:
1919
# Ignore some actions (based on what merge_group triggers):
2020
# - this action
@@ -27,7 +27,7 @@ jobs:
2727
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2828
- name: Check result
2929
if: ${{ steps.waitforstatuschecks.outputs.status != 'success' }}
30-
uses: actions/github-script@v3
30+
uses: actions/github-script@v7
3131
with:
3232
script: |
3333
core.setFailed('Status checks failed')

‎.github/workflows/micro-bm.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
if: contains(github.event.pull_request.labels.*.name, 'PR-benchmarking')
2525
steps:
2626
- name: Check Revisions
27-
uses: qinsoon/comment-env-vars@1.0.3
27+
uses: qinsoon/comment-env-vars@1.1.0
2828
with:
2929
token: ${{ secrets.GITHUB_TOKEN }}
3030
default_env: 'OPENJDK_BINDING_TRUNK_REF=master,MMTK_CORE_TRUNK_REF=master,OPENJDK_BINDING_BRANCH_REF=master,MMTK_CORE_BRANCH_REF=${{ github.event.pull_request.head.sha }}'
3131
# Trunk
3232
# - binding
3333
- name: Checkout OpenJDK Binding Trunk
34-
uses: actions/checkout@v2
34+
uses: actions/checkout@v4
3535
with:
3636
repository: mmtk/mmtk-openjdk
3737
token: ${{ secrets.GITHUB_TOKEN }}
@@ -40,14 +40,14 @@ jobs:
4040
ref: ${{ env.OPENJDK_BINDING_TRUNK_REF }}
4141
# -core
4242
- name: Checkout MMTk Core
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v4
4444
with:
4545
ref: ${{ env.MMTK_CORE_TRUNK_REF }}
4646
path: mmtk-core-trunk
4747
# Branch
4848
# - binding
4949
- name: Checkout OpenJDK Binding Branch
50-
uses: actions/checkout@v2
50+
uses: actions/checkout@v4
5151
with:
5252
repository: mmtk/mmtk-openjdk
5353
token: ${{ secrets.GITHUB_TOKEN }}
@@ -56,13 +56,13 @@ jobs:
5656
ref: ${{ env.OPENJDK_BINDING_BRANCH_REF }}
5757
# - core
5858
- name: Checkout MMTk Core
59-
uses: actions/checkout@v2
59+
uses: actions/checkout@v4
6060
with:
6161
ref: ${{ env.MMTK_CORE_BRANCH_REF }}
6262
path: mmtk-core-branch
6363
# checkout perf-kit
6464
- name: Checkout Perf Kit
65-
uses: actions/checkout@v2
65+
uses: actions/checkout@v4
6666
with:
6767
repository: mmtk/ci-perf-kit
6868
token: ${{ secrets.GITHUB_TOKEN }}
@@ -83,11 +83,11 @@ jobs:
8383
with:
8484
path: openjdk-rebench-report.md
8585
# upload run results
86-
- uses: actions/upload-artifact@v2
86+
- uses: actions/upload-artifact@v4
8787
with:
8888
name: openjdk-rebench-data
8989
path: ci-perf-kit/microbm/ci.data
90-
- uses: actions/upload-artifact@v2
90+
- uses: actions/upload-artifact@v4
9191
with:
9292
name: openjdk-rebench-report.md
9393
path: openjdk-rebench-report.md

‎.github/workflows/minimal-tests-core.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
outputs:
2121
rust: ${{ steps.rust.outputs.array }}
2222
steps:
23-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v4
2424
# Get rust version
2525
- id: rust
2626
run: |
@@ -43,14 +43,16 @@ jobs:
4343
runs-on: ${{ matrix.target.os }}
4444

4545
steps:
46-
- uses: actions/checkout@v2
46+
- uses: actions/checkout@v4
4747
- name: Install Rust
48-
uses: actions-rs/toolchain@v1
49-
with:
50-
toolchain: ${{ matrix.rust }}-${{ matrix.target.triple }}
51-
components: rustfmt, clippy
52-
# This overwrites the default toolchain with the toolchain specified above.
53-
override: true
48+
run: |
49+
rustup toolchain install ${{ matrix.rust }}-${{ matrix.target.triple }}
50+
rustup override set ${{ matrix.rust }}-${{ matrix.target.triple }}
51+
rustup component add rustfmt clippy
52+
53+
# Show the Rust toolchain we are actually using
54+
- run: rustup show
55+
- run: cargo --version
5456

5557
# Setup Environments
5658
- name: Setup Environments

‎.github/workflows/mmtk-dev-env.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
check-mmtk-dev-env:
1717
runs-on: ubuntu-22.04
1818
steps:
19-
- uses: convictional/trigger-workflow-and-wait@v1.3.0
19+
- uses: convictional/trigger-workflow-and-wait@v1.6.5
2020
with:
2121
owner: mmtk
2222
repo: mmtk-dev-env
2323
github_token: ${{ secrets.CI_ACCESS_TOKEN }}
2424
workflow_file_name: ci.yml
2525
ref: main
2626
wait_interval: 30
27-
inputs: '{}'
27+
client_payload: '{}'
2828
propagate_failure: true
2929
trigger_workflow: true
3030
wait_workflow: true

0 commit comments

Comments
 (0)