From c6e0eeba6742b76601d3fc4492f83c423d31b02a Mon Sep 17 00:00:00 2001 From: Kunshan Wang Date: Mon, 31 Mar 2025 11:01:25 +0800 Subject: [PATCH 1/5] rustup --component should be comma-separated --- .github/scripts/build-mmtk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/build-mmtk.sh b/.github/scripts/build-mmtk.sh index e2cd76b..40cb14a 100755 --- a/.github/scripts/build-mmtk.sh +++ b/.github/scripts/build-mmtk.sh @@ -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 From e562d21af7f9a5d424d6d99c896c116b80d26bc7 Mon Sep 17 00:00:00 2001 From: Kunshan Wang Date: Mon, 31 Mar 2025 11:11:40 +0800 Subject: [PATCH 2/5] Fixed CI script --- .github/workflows/ci.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79cf641..01bbae5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,10 +8,10 @@ on: jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: # Checkout repos and submodules - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Environments run: ./.github/scripts/ci-setup.sh @@ -34,20 +34,21 @@ jobs: run: ./.github/scripts/test-v8.sh msrv: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.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 From d19e47f5e2e20454c0a9559bdbb4e4b0f2c4a412 Mon Sep 17 00:00:00 2001 From: Kunshan Wang Date: Mon, 31 Mar 2025 11:19:25 +0800 Subject: [PATCH 3/5] Do we really need Python2? --- .github/scripts/ci-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/ci-setup.sh b/.github/scripts/ci-setup.sh index b1eed4f..2ffe273 100755 --- a/.github/scripts/ci-setup.sh +++ b/.github/scripts/ci-setup.sh @@ -2,5 +2,5 @@ set -xe . $(dirname "$0")/common.sh -sudo apt-get install -y build-essential curl git python2 python3 pkg-config sudo vim clang +sudo apt-get install -y build-essential curl git python3 pkg-config sudo vim clang sudo apt-get clean From 3ba27d897f0723591bf0330d7a86afe4fdd1ee38 Mon Sep 17 00:00:00 2001 From: Kunshan Wang Date: Mon, 31 Mar 2025 13:28:45 +0800 Subject: [PATCH 4/5] Revert "Do we really need Python2?" This reverts commit d19e47f5e2e20454c0a9559bdbb4e4b0f2c4a412. --- .github/scripts/ci-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/ci-setup.sh b/.github/scripts/ci-setup.sh index 2ffe273..b1eed4f 100755 --- a/.github/scripts/ci-setup.sh +++ b/.github/scripts/ci-setup.sh @@ -2,5 +2,5 @@ set -xe . $(dirname "$0")/common.sh -sudo apt-get install -y build-essential curl git python3 pkg-config sudo vim clang +sudo apt-get install -y build-essential curl git python2 python3 pkg-config sudo vim clang sudo apt-get clean From 607360c0fbac2565fbe4bd2d47cde24611d669a0 Mon Sep 17 00:00:00 2001 From: Kunshan Wang Date: Mon, 31 Mar 2025 13:29:10 +0800 Subject: [PATCH 5/5] Switch to 22.04 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01bbae5..ea07aff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: # Checkout repos and submodules - uses: actions/checkout@v4 @@ -34,7 +34,7 @@ jobs: run: ./.github/scripts/test-v8.sh msrv: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4