Skip to content

Commit

Permalink
Merge pull request #28 from rust-embedded/fix-ci
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
newAM authored Oct 21, 2023
2 parents 1d97fdb + 05c60dc commit cfc652e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Build

on:
workflow_dispatch:
pull_request:
push:
branches:
Expand All @@ -25,7 +26,6 @@ jobs:
with:
toolchain: nightly
target: ${{ matrix.target }}
components: rustfmt

- uses: actions/checkout@v4

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/test_runner_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cfc652e

Please sign in to comment.