From d87f8cd4b3446a26bab7998f5e17a76d3c9fdfce Mon Sep 17 00:00:00 2001
From: Huaqi Fang <578567190@qq.com>
Date: Thu, 5 Dec 2024 15:23:57 +0800
Subject: [PATCH] ci: Fix missing _zicbom_svpbmt_sscof qemu ext and use 2024.06
 qemu

Signed-off-by: Huaqi Fang <578567190@qq.com>
---
 .github/linuxsdk.Dockerfile | 2 +-
 .github/workflows/build.yml | 4 ++--
 .gitlab-ci.yml              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/linuxsdk.Dockerfile b/.github/linuxsdk.Dockerfile
index 5fce5f5..7c54c6f 100644
--- a/.github/linuxsdk.Dockerfile
+++ b/.github/linuxsdk.Dockerfile
@@ -37,7 +37,7 @@ RUN pip3 cache purge
 # create USER with PASS
 ARG USER=nuclei
 ARG PASS=riscv123
-ARG QEMUVER=2023.10
+ARG QEMUVER=2024.06
 ARG BRANCH=dev_nuclei_next
 
 RUN groupadd --system $USER
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 096374b..8572c13 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,7 +65,7 @@ jobs:
             python3 python3-pip mtools
           sudo pip3 install git-archive-all
           mkdir -p buildroot/dl
-          QEMUVER=2023.10
+          QEMUVER=2024.06
           if [ ! -f buildroot/dl/nuclei-qemu-${QEMUVER}-linux-x64.tar.gz ] ; then
             wget --progress=dot -P buildroot/dl https://nucleisys.com/upload/files/toochain/qemu/nuclei-qemu-${QEMUVER}-linux-x64.tar.gz
           fi
@@ -94,7 +94,7 @@ jobs:
           fi
           echo "which $qemucmd" > $SHOWQEMUSH
           echo "$qemucmd --version" >> $SHOWQEMUSH
-          echo "$qemucmd -M nuclei_${SOC},download=flashxip -cpu nuclei-${CORE},ext=$ARCH_EXT -smp 8 -m 2g -bios freeloader_qemu.elf -nographic -drive file=disk.img,if=sd,format=raw" > $RUNQEMUSH
+          echo "$qemucmd -M nuclei_${SOC},download=flashxip -cpu nuclei-${CORE},ext=${ARCH_EXT}_zicbom_svpbmt_sscof -smp 8 -m 2g -bios freeloader_qemu.elf -nographic -drive file=disk.img,if=sd,format=raw" > $RUNQEMUSH
           chmod +x $RUNQEMUSH
           chmod +x $SHOWQEMUSH
           unset TIMER_HZ
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f705062..433b913 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,7 +146,7 @@ cache:
         fi
         echo "which $qemucmd" > $SHOWQEMUSH
         echo "$qemucmd --version" >> $SHOWQEMUSH
-        echo "$qemucmd -M nuclei_${SOC},download=flashxip -cpu nuclei-${CORE},ext=$ARCH_EXT -smp 8 -m 2g -bios freeloader_qemu.elf -nographic -drive file=disk.img,if=sd,format=raw" > $RUNQEMUSH
+        echo "$qemucmd -M nuclei_${SOC},download=flashxip -cpu nuclei-${CORE},ext=${ARCH_EXT}_zicbom_svpbmt_sscof -smp 8 -m 2g -bios freeloader_qemu.elf -nographic -drive file=disk.img,if=sd,format=raw" > $RUNQEMUSH
         chmod +x $RUNQEMUSH
         chmod +x $SHOWQEMUSH
     - |