Skip to content

Fixing CI scripts #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .github/scripts/build-mmtk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -xe
. $(dirname "$0")/common.sh

# simply build mmtk-v8 with nogc
rustup toolchain install $RUSTUP_TOOLCHAIN --target x86_64-unknown-linux-gnu --component clippy rustfmt
rustup toolchain install $RUSTUP_TOOLCHAIN --target x86_64-unknown-linux-gnu --component clippy,rustfmt
rustup override set $RUSTUP_TOOLCHAIN

cd $THE_ROOT/mmtk && cargo build --features nogc
23 changes: 12 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ on:

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
# Checkout repos and submodules
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup Environments
run: ./.github/scripts/ci-setup.sh

Expand All @@ -34,20 +34,21 @@ jobs:
run: ./.github/scripts/test-v8.sh

msrv:
runs-on: ubuntu-20.04
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
# The cargo-msrv tool sometimes requires a higher Rust version than our current rust-toolchain.
run: cargo +stable install cargo-msrv
# Verify the MSRV defined in Cargo.toml
- name: Verify MSRV
run: cargo msrv --path mmtk verify
# If the previous step fails, find MSRV
- name: Find MSRV
if: failure()
run: cargo msrv --path mmtk
run: cargo msrv --path mmtk find
Loading