@@ -294,41 +294,28 @@ jobs:
294
294
run : |
295
295
cargo test --manifest-path cortex-ar/Cargo.toml
296
296
297
- # Run some programs in QEMU 8 on Linux (but not MPS3-AN536 examples)
298
- qemu-test-linux :
297
+ # Run some programs in QEMU 9
298
+ qemu-test :
299
299
runs-on : ubuntu-24.04
300
300
needs : [build-all]
301
301
steps :
302
- - name : Install QEMU
303
- run : sudo apt-get -y update && sudo apt-get -y install qemu-system-arm
304
302
- name : Checkout
305
303
uses : actions/checkout@v4
304
+ - name : Install Dependencies
305
+ run : |
306
+ sudo apt-get -y update
307
+ sudo apt-get -y install libpixman-1-0 libfdt1 libglib2.0-0t64
308
+ - name : Install custom QEMU into /opt
309
+ run : |
310
+ curl -sSL https://github.com/jonathanpallant/qemu9-for-ubuntu-2404/releases/download/qemu-9.2.3%2Bbuild0/qemu-9.2.3-ubuntu-24.04.tar.gz | sudo tar xvzf - -C /
306
311
- name : Run tests in QEMU
307
- run : ./tests.sh
308
-
309
- # Run some programs in QEMU 9 on Windows (including MPS3-AN536 examples)
310
- qemu-test-windows :
311
- runs-on : windows-latest
312
- needs : [build-all]
313
- steps :
314
- - name : Checkout
315
- uses : actions/checkout@v4
316
- - name : Install QEMU
317
- run : choco install qemu
318
- - name : Run tests in QEMU
319
- shell : bash
320
- run : PATH=${PATH}:/c/Program\ Files/qemu ./tests.sh
321
-
322
- # Gather all the above qemu jobs together for the purposes of getting an overall pass-fail
323
- qemu-test-all :
324
- runs-on : ubuntu-24.04
325
- needs : [qemu-test-linux, qemu-test-windows]
326
- steps :
327
- - run : /bin/true
312
+ run : |
313
+ export PATH=/opt/qemu/bin:$PATH
314
+ ./tests.sh
328
315
329
316
# Gather all the above xxx-all jobs together for the purposes of getting an overall pass-fail
330
317
all :
331
318
runs-on : ubuntu-24.04
332
- needs : [docs-all, build-all, fmt-all, unit-test, qemu-test-all ] # not gating on clippy-all
319
+ needs : [docs-all, build-all, fmt-all, unit-test, qemu-test] # not gating on clippy-all
333
320
steps :
334
321
- run : /bin/true
0 commit comments