Merge branch 'main' into cards

LuckyTurtleDev · May 21, 2023 · ece3efb · ece3efb
2 parents 2516063 + b17a555
commit ece3efb
Show file tree

Hide file tree

Showing 13 changed files with 837 additions and 1,417 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -17,11 +17,11 @@ jobs:
     runs-on: ${{ matrix.os }}-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install SDL2 Linux
-        if:  ${{ matrix.os == 'ubuntu' }}
-        run: sudo apt-get update && sudo apt-get install -y libsdl2-dev
       - uses: dtolnay/rust-toolchain@stable
         id: "rust-toolchain"
+      - name: Install alsa, libudev
+        if:  ${{ matrix.os == 'ubuntu' }}
+        run: sudo apt-get update && sudo apt-get install -y libasound2-dev libudev-dev
       - uses: actions/cache@v3
         with:
           path: |
@@ -32,12 +32,10 @@ jobs:
       - run: cargo test --all-features -p m3-models
         env:
           RUST_BACKTRACE: 1
-      - run: cargo test --features sdl2_bundled -p m3-pc -p m3-map -p m3-macro
-        if:  ${{ matrix.os == 'windows' }}
+      - run: cargo test --all-features -p m3-map
         env:
           RUST_BACKTRACE: 1
-      - run: cargo test -p m3-pc
-        if:  ${{ matrix.os != 'windows' }}
+      - run: cargo test --all-features -p m3-pc
         env:
           RUST_BACKTRACE: 1