Merge pull request #394 from hermit-os/xtask-ovmf

fix(xtask): update OVMF
hermit-os · Oct 28, 2024 · 1420a95 · 1420a95
2 parents 8a99a8f + 45af134
commit 1420a95
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,16 +73,16 @@ jobs:
           tar -xvf opensbi-*-rv-bin.tar.xz opensbi-1.5.1-rv-bin/share/opensbi/lp64/generic/firmware/fw_jump.bin
       - name: Download OVMF (prebuilt)
         run: |
-          gh release download edk2-stable202405-r1 --repo rust-osdev/ovmf-prebuilt --pattern 'edk2-stable*-bin.tar.xz'
-          tar -xvf edk2-stable*-bin.tar.xz edk2-stable202405-r1-bin/x64
+          gh release download edk2-stable202408-r1 --repo rust-osdev/ovmf-prebuilt --pattern 'edk2-stable*-bin.tar.xz'
+          tar -xvf edk2-stable*-bin.tar.xz edk2-stable202408-r1-bin/x64
         if: matrix.os != 'ubuntu-latest'
       - name: Download OVMF (ubuntu)
         run: |
           sudo apt-get update
           sudo apt-get install ovmf
-          mkdir -p edk2-stable202405-r1-bin/x64
-          cp /usr/share/OVMF/OVMF_CODE.fd edk2-stable202405-r1-bin/x64/code.fd
-          cp /usr/share/OVMF/OVMF_VARS.fd edk2-stable202405-r1-bin/x64/vars.fd
+          mkdir -p edk2-stable202408-r1-bin/x64
+          cp /usr/share/OVMF/OVMF_CODE.fd edk2-stable202408-r1-bin/x64/code.fd
+          cp /usr/share/OVMF/OVMF_VARS.fd edk2-stable202408-r1-bin/x64/vars.fd
         if: matrix.os == 'ubuntu-latest'
       - name: Run VM (hello_world, dev)
         run: cargo xtask ci qemu --target ${{ matrix.target }}
@@ -134,8 +134,8 @@ jobs:
           ./firecracker --version
       - name: Download OVMF
         run: |
-          gh release download edk2-stable202405-r1 --repo rust-osdev/ovmf-prebuilt --pattern 'edk2-stable*-bin.tar.xz'
-          tar -xvf edk2-stable*-bin.tar.xz edk2-stable202405-r1-bin/x64
+          gh release download edk2-stable202408-r1 --repo rust-osdev/ovmf-prebuilt --pattern 'edk2-stable*-bin.tar.xz'
+          tar -xvf edk2-stable*-bin.tar.xz edk2-stable202408-r1-bin/x64
       - uses: dtolnay/rust-toolchain@stable
       - name: Run QEMU (hello_world, dev)
         run: cargo xtask ci qemu --target x86_64 --accel

diff --git a/xtask/src/ci/qemu.rs b/xtask/src/ci/qemu.rs
@@ -134,10 +134,10 @@ impl Qemu {
 					Target::X86_64Uefi => {
 						cpu_args.push("-drive".to_string());
 						cpu_args
-							.push("if=pflash,format=raw,readonly=on,file=edk2-stable202405-r1-bin/x64/code.fd".to_string());
+							.push("if=pflash,format=raw,readonly=on,file=edk2-stable202408-r1-bin/x64/code.fd".to_string());
 						cpu_args.push("-drive".to_string());
 						cpu_args
-							.push("if=pflash,format=raw,readonly=on,file=edk2-stable202405-r1-bin/x64/vars.fd".to_string());
+							.push("if=pflash,format=raw,readonly=on,file=edk2-stable202408-r1-bin/x64/vars.fd".to_string());
 						cpu_args.push("-drive".to_string());
 						cpu_args.push("format=raw,file=fat:rw:target/esp".to_string());
 					}