Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
alloncm committed Dec 21, 2024
1 parent 2fa7160 commit 18cec2a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
build-and-test-all-targets:
strategy:
matrix:
os: [windows-latest]
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# toolchain: stable, nightly
toolchain: 1.73.0
rustflags: ""
cache-directories: "/home/runner/.cargo/bin
C:\\Users\\runneradmin\\.cargo\\bin"
Expand All @@ -28,11 +28,13 @@ jobs:
- name: Run tests
run: cargo make test
# for some reason the sdl installation causing this to fail (some error about not finding glibc) so this should before the sdl
- name: rpi os
- name: rpi os
if: ${{ matrix.os == 'ubuntu-latest' }} # This fails on windows since it does not have docker installed
run: cargo make rpios
- name: Build sdl
run: cargo make sdl
- name: Build libretro
run: cargo make libretro_desktop
- name: rpi baremetal
run: rustup toolchain install nightly
run: cargo make -e RPI=4 rpibm
2 changes: 1 addition & 1 deletion Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ try_install libsdl2-dev
]

[tasks.rpios]
install_crate = {crate_name = "cross", binary = "cross", test_arg = "-h"}
install_crate = {crate_name = "cross", binary = "cross", test_arg = "-h", install_crate_args="--locked"}
command = "cross"
args = ["build", "--release", "--target", "armv7-unknown-linux-gnueabihf", "--bin", "rpios","--no-default-features", "--features", "os"]

Expand Down

0 comments on commit 18cec2a

Please sign in to comment.