ci: update github ci using latest 2023.10 toolchain and qemu

Signed-off-by: Huaqi Fang <[email protected]>
Nuclei-Software · Oct 19, 2023 · 5053ae6 · 5053ae6
1 parent e7f8277
commit 5053ae6
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/.github/workflows/build_sdk.yaml b/.github/workflows/build_sdk.yaml
@@ -63,12 +63,12 @@ jobs:
           pip3 install -q -r tools/scripts/requirements.txt
           mkdir -p prebuilt_tools
           cd prebuilt_tools
-          toolzip=nuclei_riscv_newlibc_prebuilt_linux64_nuclei-2023.07.19.tar.bz2
+          toolzip=nuclei_riscv_newlibc_prebuilt_linux64_nuclei-2023.10.tar.bz2
           if [ ! -e $toolzip ] ; then
             wget -q --no-check-certificate https://nucleisys.com/upload/files/toochain/gcc/$toolzip
           fi
           tar -xjf $toolzip
-          toolzip=nuclei_qemu-2023.07.19-linux.zip
+          toolzip=nuclei_qemu-2023.10-linux.zip
           if [ ! -e $toolzip ] ; then
             wget -q --no-check-certificate https://nucleisys.com/upload/files/toochain/qemu/$toolzip
           fi
@@ -83,25 +83,18 @@ jobs:
           cd ..
           echo "NUCLEI_TOOL_ROOT=$(pwd)/prebuilt_tools" > setup_config.sh
 
-    - name: Build SDK for Nuclei Eval SoC Using GCC
+    - name: Build and Run SDK for Nuclei Eval SoC
       if: matrix.soc == 'evalsoc'
       run: |
         echo "Setup build environment"
         source setup.sh
         export APPCFG=tools/scripts/nsdk_cli/configs/application.json
-        export HWCFG=tools/scripts/nsdk_cli/configs/nuclei_fpga_eval_ci_qemu_small_gnu.json
-        export LOGDIR=logs/nuclei_fpga_eval_ci_gnu
-        python3 tools/scripts/nsdk_cli/nsdk_bench.py --appcfg $APPCFG --hwcfg $HWCFG --parallel="-j" --logdir $LOGDIR --run_target qemu --run
-
-    - name: Build SDK for Nuclei Eval SoC Using LLVM
-      if: matrix.soc == 'evalsoc'
-      run: |
-        echo "Setup build environment"
-        source setup.sh
-        export APPCFG=tools/scripts/nsdk_cli/configs/application.json
-        export HWCFG=tools/scripts/nsdk_cli/configs/nuclei_fpga_eval_ci_qemu_small_llvm.json
-        export LOGDIR=logs/nuclei_fpga_eval_ci_llvm
-        python3 tools/scripts/nsdk_cli/nsdk_bench.py --appcfg $APPCFG --hwcfg $HWCFG --parallel="-j" --logdir $LOGDIR --run_target qemu --run
+        for hwcfg in "nuclei_fpga_eval_ci_qemu_small_gnu" "nuclei_fpga_eval_ci_qemu_small_llvm" ; do
+            export HWCFG=tools/scripts/nsdk_cli/configs/${hwcfg}.json
+            export LOGDIR=logs/${hwcfg}
+            echo "Build and run for ${hwcfg}"
+            python3 tools/scripts/nsdk_cli/nsdk_bench.py --appcfg $APPCFG --hwcfg $HWCFG --parallel="-j" --logdir $LOGDIR --run_target qemu --run
+        done
 
     - name: Build SDK for GD32VF103 SoC
       if: matrix.soc == 'gd32vf103'