Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/scripts/ci-style.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

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

# --- Check format ---
cargo fmt -- --check
cargo fmt --manifest-path=macros/Cargo.toml -- --check

# All versions of Clippy randomly crash on Darwin. We disable Clippy tests for Darwin for now.
if [[ $(uname) == "Darwin" ]]; then
exit 0
fi

# Workaround the clippy issue on Rust 1.72: https://github.com/mmtk/mmtk-core/issues/929.
# If we are not testing with Rust 1.72, or there is no problem running the following clippy checks, we can remove this export.
CLIPPY_VERSION=$(cargo clippy --version)
Expand Down
18 changes: 4 additions & 14 deletions .github/workflows/api-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout mmtk-core
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
# Full git history needed
fetch-depth: 0

# cargo-public-api can be built with the latest stable toolchain.
- name: Install stable Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
# make it the active toolchain
override: true

# cargo-public-api needs a nightly toolchain installed in order to work.
# It does not have to be the active toolchain.
- name: Install nightly Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
profile: minimal
run: rustup toolchain install nightly

# Show the Rust toolchain we are actually using
- run: rustup show
- run: cargo --version
- run: cargo +nightly --version

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto-merge-inner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ jobs:
shell: bash

- name: Checkout MMTk Core
uses: actions/checkout@v3
uses: actions/checkout@v4
if: steps.check-input.outputs.skip == 'false'
with:
path: ${{ env.MMTK_CORE_WORK_DIR }}
- name: Checkout repository
if: steps.check-input.outputs.skip == 'false'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ inputs.repo }}
path: ${{ env.BINDING_WORK_DIR }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/binding-tests-openjdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout MMTk Core
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: mmtk-core
- name: Checkout OpenJDK Binding
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: ${{ inputs.repo }}
path: mmtk-openjdk
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/cargo-msrv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
msrv:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- uses: actions/checkout@v4

# Show the Rust toolchain we are actually using
- run: rustup show
- run: cargo --version

- name: Install cargo-msrv
run: cargo install cargo-msrv
# Verify the MSRV defined in Cargo.toml
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/cargo-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ jobs:
cargo-publish:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- name: Install latest nightly
uses: actions-rs/toolchain@v1
with:
components: rustfmt, clippy
target: i686-unknown-linux-gnu
# This overwrites the default toolchain with the toolchain specified above.
override: true
- uses: actions/checkout@v4

# Show the Rust toolchain we are actually using
- run: rustup show
- run: cargo --version

- name: Cargo login
run: cargo login ${{ secrets.CI_CARGO_LOGIN }}
- name: Publish sub crates
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/extended-tests-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
if: contains(github.event.pull_request.labels.*.name, 'PR-extended-testing')
steps:
- name: Checkout MMTk Core
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: mmtk-core
- name: Checkout V8 Binding
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: ${{ needs.binding-refs.outputs.v8_binding_repo }}
path: mmtk-v8
Expand Down Expand Up @@ -71,11 +71,11 @@ jobs:
if: contains(github.event.pull_request.labels.*.name, 'PR-extended-testing')
steps:
- name: Checkout MMTk Core
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: mmtk-core
- name: Checkout JikesRVM Binding
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: ${{ needs.binding-refs.outputs.jikesrvm_binding_repo }}
path: mmtk-jikesrvm
Expand Down Expand Up @@ -106,11 +106,11 @@ jobs:
if: contains(github.event.pull_request.labels.*.name, 'PR-extended-testing')
steps:
- name: Checkout MMTk Core
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: mmtk-core
- name: Checkout Julia Binding
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: ${{ needs.binding-refs.outputs.julia_binding_repo }}
path: mmtk-julia
Expand Down Expand Up @@ -154,12 +154,12 @@ jobs:
DEBUG_LEVEL: ${{ matrix.debug-level }}
steps:
- name: Checkout MMTk Core
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: mmtk-core

- name: Checkout MMTk Ruby binding
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ needs.binding-refs.outputs.ruby_binding_repo }}
path: mmtk-ruby
Expand All @@ -175,7 +175,7 @@ jobs:
working-directory: mmtk-ruby

- name: Checkout Ruby
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ steps.extract-ruby-revision.outputs.ruby_repo }}
ref: ${{ steps.extract-ruby-revision.outputs.ruby_rev }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/link-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ jobs:
check-broken-links-in-docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Restore lychee cache
uses: actions/cache@v3
with:
path: .lycheecache
key: cache-lychee-${{ github.sha }}
restore-keys: cache-lychee-
- name: Check links in docs/*.md
uses: lycheeverse/[email protected].0
uses: lycheeverse/[email protected].3
with:
fail: true
token: ${{ secrets.GITHUB_TOKEN }}
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/**
- name: Save lychee cache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
if: always()
with:
path: .lycheecache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/merge-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: 'Wait for status checks'
id: waitforstatuschecks
timeout-minutes: 120
uses: "WyriHaximus/github-action-wait-for-status@v1.7.0"
uses: "WyriHaximus/github-action-wait-for-status@v1.8.0"
with:
# Ignore some actions (based on what merge_group triggers):
# - this action
Expand All @@ -27,7 +27,7 @@ jobs:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- name: Check result
if: ${{ steps.waitforstatuschecks.outputs.status != 'success' }}
uses: actions/github-script@v3
uses: actions/github-script@v7
with:
script: |
core.setFailed('Status checks failed')
16 changes: 8 additions & 8 deletions .github/workflows/micro-bm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
if: contains(github.event.pull_request.labels.*.name, 'PR-benchmarking')
steps:
- name: Check Revisions
uses: qinsoon/comment-env-vars@1.0.3
uses: qinsoon/comment-env-vars@1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
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 }}'
# Trunk
# - binding
- name: Checkout OpenJDK Binding Trunk
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: mmtk/mmtk-openjdk
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -40,14 +40,14 @@ jobs:
ref: ${{ env.OPENJDK_BINDING_TRUNK_REF }}
# -core
- name: Checkout MMTk Core
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ env.MMTK_CORE_TRUNK_REF }}
path: mmtk-core-trunk
# Branch
# - binding
- name: Checkout OpenJDK Binding Branch
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: mmtk/mmtk-openjdk
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -56,13 +56,13 @@ jobs:
ref: ${{ env.OPENJDK_BINDING_BRANCH_REF }}
# - core
- name: Checkout MMTk Core
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: ${{ env.MMTK_CORE_BRANCH_REF }}
path: mmtk-core-branch
# checkout perf-kit
- name: Checkout Perf Kit
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: mmtk/ci-perf-kit
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -83,11 +83,11 @@ jobs:
with:
path: openjdk-rebench-report.md
# upload run results
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: openjdk-rebench-data
path: ci-perf-kit/microbm/ci.data
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: openjdk-rebench-report.md
path: openjdk-rebench-report.md
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/minimal-tests-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
outputs:
rust: ${{ steps.rust.outputs.array }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
# Get rust version
- id: rust
run: |
Expand All @@ -43,14 +43,16 @@ jobs:
runs-on: ${{ matrix.target.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}-${{ matrix.target.triple }}
components: rustfmt, clippy
# This overwrites the default toolchain with the toolchain specified above.
override: true
run: |
rustup toolchain install ${{ matrix.rust }}-${{ matrix.target.triple }}
rustup override set ${{ matrix.rust }}-${{ matrix.target.triple }}
rustup component add rustfmt clippy

# Show the Rust toolchain we are actually using
- run: rustup show
- run: cargo --version

# Setup Environments
- name: Setup Environments
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mmtk-dev-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
check-mmtk-dev-env:
runs-on: ubuntu-22.04
steps:
- uses: convictional/trigger-workflow-and-wait@v1.3.0
- uses: convictional/trigger-workflow-and-wait@v1.6.5
with:
owner: mmtk
repo: mmtk-dev-env
github_token: ${{ secrets.CI_ACCESS_TOKEN }}
workflow_file_name: ci.yml
ref: main
wait_interval: 30
inputs: '{}'
client_payload: '{}'
propagate_failure: true
trigger_workflow: true
wait_workflow: true
Loading