ci: use xtask

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>

Author: mkroening

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
     name: Run
     strategy:
       matrix:
-        target: [x86_64, x86_64-uefi, x86_64-fc, aarch64, riscv64]
+        target: [x86_64, aarch64, riscv64]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -70,79 +70,13 @@ jobs:
             lfs: true
       - name: Install stable Rust toolchain
         uses: dtolnay/rust-toolchain@stable
-      - name: Build
-        run: cargo xtask build --target ${{ matrix.target }}
-      - name: Run loader (x86_64)
+      - name: Run VM (hello_world, dev)
+        run: cargo xtask ci qemu --target ${{ matrix.target }}
+      - name: Run VM (hello_world, release)
+        run: cargo xtask ci qemu --target ${{ matrix.target }} --release
+      - name: Run VM (hello_c, dev)
         if: matrix.target == 'x86_64'
-        run: |
-          qemu-system-x86_64 \
-            -cpu qemu64,apic,fsgsbase,fxsr,rdrand,rdtscp,xsave,xsaveopt \
-            -smp 1 -m 64M \
-            -device isa-debug-exit,iobase=0xf4,iosize=0x04 \
-            -display none -serial stdio \
-            -kernel target/x86_64/debug/hermit-loader \
-            -initrd data/x86_64/hello_world
-          qemu-system-x86_64 \
-            -cpu qemu64,apic,fsgsbase,fxsr,rdrand,rdtscp,xsave,xsaveopt \
-            -smp 1 -m 64M \
-            -device isa-debug-exit,iobase=0xf4,iosize=0x04 \
-            -display none -serial stdio \
-            -kernel target/x86_64/debug/hermit-loader \
-            -initrd data/x86_64/hello_c
-      - name: Run loader (aarch64)
-        if: matrix.target == 'aarch64'
-        run: |
-          qemu-system-aarch64 \
-            -machine virt,gic-version=3 -cpu cortex-a72 -smp 1 -m 512M \
-            -display none -serial stdio -semihosting \
-            -kernel target/aarch64/debug/hermit-loader \
-            -device guest-loader,addr=0x48000000,initrd=data/aarch64/hello_world
-      - name: Run loader (riscv64)
-        if: matrix.target == 'riscv64'
-        run: |
-          qemu-system-riscv64 \
-            -machine virt \
-            -cpu rv64 \
-            -smp 1 \
-            -m 32M \
-            -display none -serial stdio \
-            -kernel target/riscv64/debug/hermit-loader \
-            -initrd data/riscv64/hello_world
-      - name: Build (release)
-        run: cargo xtask build --target ${{ matrix.target }} --release
-      - name: Run loader (release, x86_64)
+        run: cargo xtask ci qemu --target ${{ matrix.target }} --image hello_c
+      - name: Run VM (hello_c, release)
         if: matrix.target == 'x86_64'
-        run: |
-          qemu-system-x86_64 \
-            -cpu qemu64,apic,fsgsbase,fxsr,rdrand,rdtscp,xsave,xsaveopt \
-            -smp 1 -m 64M \
-            -device isa-debug-exit,iobase=0xf4,iosize=0x04 \
-            -display none -serial stdio \
-            -kernel target/x86_64/release/hermit-loader \
-            -initrd data/x86_64/hello_world
-          qemu-system-x86_64 \
-            -cpu qemu64,apic,fsgsbase,fxsr,rdrand,rdtscp,xsave,xsaveopt \
-            -smp 1 -m 64M \
-            -device isa-debug-exit,iobase=0xf4,iosize=0x04 \
-            -display none -serial stdio \
-            -kernel target/x86_64/release/hermit-loader \
-            -initrd data/x86_64/hello_c
-      - name: Run loader (release, aarch64)
-        if: matrix.target == 'aarch64'
-        run: |
-          qemu-system-aarch64 \
-            -machine virt,gic-version=3 -cpu cortex-a72 -smp 1 -m 512M \
-            -display none -serial stdio -semihosting \
-            -kernel target/aarch64/release/hermit-loader \
-            -device guest-loader,addr=0x48000000,initrd=data/aarch64/hello_world
-      - name: Run loader (release, riscv64)
-        if: matrix.target == 'riscv64'
-        run: |
-          qemu-system-riscv64 \
-            -machine virt \
-            -cpu rv64 \
-            -smp 1 \
-            -m 32M \
-            -display none -serial stdio \
-            -kernel target/riscv64/release/hermit-loader \
-            -initrd data/riscv64/hello_world
+        run: cargo xtask ci qemu --target ${{ matrix.target }} --image hello_c --release