Skip to content

Commit 30f97dd

Browse files
committed
Use scoop again and try -L option
1 parent 9bb6355 commit 30f97dd

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,14 @@ jobs:
6464
HOMEBREW_NO_AUTO_UPDATE: 1
6565
HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 1
6666
HOMEBREW_NO_INSTALL_CLEANUP: 1
67-
- name: Install QEMU (Windows)
67+
- name: Install Scoop (Windows)
6868
run: |
69-
choco install qemu --version=2020.11.20 -y --no-progress
70-
echo "C:\Program Files\qemu" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
69+
Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
70+
echo "$HOME\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
71+
if: runner.os == 'Windows'
72+
shell: pwsh
73+
- name: Install QEMU (Windows)
74+
run: scoop install qemu
7175
if: runner.os == 'Windows'
7276
shell: pwsh
7377
- name: "Print QEMU Version"
@@ -78,7 +82,14 @@ jobs:
7882
qemu-system-x86_64 -drive format=raw,file=target/x86_64-bootloader/release/bootloader.bin -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none
7983
if [ $? -eq 123 ]; then (exit 0); else (exit 1); fi
8084
shell: 'bash {0}'
85+
if: runner.os != 'Windows'
8186

87+
- name: 'Run Test Kernel with Bootloader (Windows)'
88+
run: |
89+
qemu-system-x86_64 -drive format=raw,file=target/x86_64-bootloader/release/bootloader.bin -device isa-debug-exit,iobase=0xf4,iosize=0x04 -display none -L "C:\Program Files\qemu"
90+
if [ $? -eq 123 ]; then (exit 0); else (exit 1); fi
91+
shell: 'bash {0}'
92+
if: runner.os == 'Windows'
8293

8394
build_example_kernel:
8495
name: "Build Example Kernel"

0 commit comments

Comments
 (0)