From 05c60dc10b1b7dd56911c77421eec2c84fcdb38c Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 21 Oct 2023 09:57:02 +0900 Subject: [PATCH] Fix CI --- .github/workflows/build.yml | 5 +++-- tests/test_runner_wrapper.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1d49bb..b8b1d0a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,7 @@ name: Build on: + workflow_dispatch: pull_request: push: branches: @@ -25,7 +26,6 @@ jobs: with: toolchain: nightly target: ${{ matrix.target }} - components: rustfmt - uses: actions/checkout@v4 @@ -37,8 +37,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@master with: + toolchain: nightly components: rustfmt - run: cargo fmt --all -- --check diff --git a/tests/test_runner_wrapper.sh b/tests/test_runner_wrapper.sh index ec9f6cd..f80bb6c 100755 --- a/tests/test_runner_wrapper.sh +++ b/tests/test_runner_wrapper.sh @@ -3,7 +3,7 @@ TIMEOUT="timeout 10" if [[ $1 == *"aarch64"* ]]; then - $TIMEOUT qemu-system-aarch64 -M raspi3 -display none -semihosting -kernel $1 + $TIMEOUT qemu-system-aarch64 -M raspi3b -display none -semihosting -kernel $1 elif [[ $1 == *"riscv64"* ]]; then $TIMEOUT qemu-system-riscv64 -M virt -bios tests/riscv64_virt/fw_jump.elf -display none -kernel $1 fi