From 78ce338bf69c4d9aa8ea91ff29cf52b44ca08fc6 Mon Sep 17 00:00:00 2001
From: Yinan Xu <xuyinan@ict.ac.cn>
Date: Tue, 16 Jan 2024 19:04:17 +0800
Subject: [PATCH] Fix CI and bump submodules

---
 .github/workflows/main.yml | 22 ++--------------------
 NEMU                       |  2 +-
 NutShell                   |  2 +-
 XiangShan                  |  2 +-
 env-test.sh                |  4 ++++
 setup-tools.sh             |  4 ++--
 setup.sh                   |  9 ---------
 7 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b2ceeffa3..efad47168 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,12 +16,12 @@ jobs:
   # This workflow contains a single job called "build"
   setup-develop-env:
     # The type of runner that the job will run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup XiangShan environment
         run: |
@@ -34,21 +34,3 @@ jobs:
         run: |
             cd $GITHUB_WORKSPACE
             source ./env-test.sh
-      
-# Github hosted CI does not support XiangShan
-  sim-xiangshan:
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v2
-      - name: Sim XiangShan using Verilator
-        run: |
-            git config --global url."https://github.com/".insteadOf git@github.com:
-            git config --global url."https://".insteadOf git://
-            cd $GITHUB_WORKSPACE
-            source ./env.sh
-            make -C nexus-am clean
-            source ./setup.sh
-            cd $GITHUB_WORKSPACE/XiangShan
-            make clean
-            make emu CONFIG=MinimalConfig
-            ./build/emu -b 0 -e 0 -i ./ready-to-run/linux.bin
diff --git a/NEMU b/NEMU
index 8ce7caa53..3033a69fb 160000
--- a/NEMU
+++ b/NEMU
@@ -1 +1 @@
-Subproject commit 8ce7caa53052427c47fb215c0736a75a4fb0d53a
+Subproject commit 3033a69fb8cdd9939ebb43315f86f38ab97346fe
diff --git a/NutShell b/NutShell
index 4bb506b26..fa8de4828 160000
--- a/NutShell
+++ b/NutShell
@@ -1 +1 @@
-Subproject commit 4bb506b26e72f4df7759a9c1a610df7f969a5126
+Subproject commit fa8de482817e6044042e8edeb4e3a60f494195c8
diff --git a/XiangShan b/XiangShan
index 30f5dffa0..8fae59bba 160000
--- a/XiangShan
+++ b/XiangShan
@@ -1 +1 @@
-Subproject commit 30f5dffa09c6c0820e3ec419ffd4785cd96986a0
+Subproject commit 8fae59bba57fd80fcd1d85aadbf87895b97d167a
diff --git a/env-test.sh b/env-test.sh
index 2b7dfef66..5230f9e81 100644
--- a/env-test.sh
+++ b/env-test.sh
@@ -8,6 +8,10 @@ source env.sh
 # if develop environment has been setup correctly
 export NOOP_HOME=$(pwd)/NutShell
 
+cd ${NEMU_HOME}
+make riscv64-nutshell-ref_defconfig
+make
+
 # Compile processor project
 cd ${NOOP_HOME}
 make init
diff --git a/setup-tools.sh b/setup-tools.sh
index ced658aab..440ebc254 100755
--- a/setup-tools.sh
+++ b/setup-tools.sh
@@ -3,7 +3,7 @@
 
 apt update
 apt install proxychains4 shadowsocks-libev vim wget git tmux make gcc time curl libreadline6-dev libsdl2-dev gcc-riscv64-linux-gnu openjdk-11-jre zlib1g-dev device-tree-compiler flex autoconf bison sqlite3 libsqlite3-dev
-sh -c "curl -L https://github.com/com-lihaoyi/mill/releases/download/0.9.8/0.9.8 > /usr/local/bin/mill && chmod +x /usr/local/bin/mill"
+sh -c "curl -L https://github.com/com-lihaoyi/mill/releases/download/0.11.6/0.11.6 > /usr/local/bin/mill && chmod +x /usr/local/bin/mill"
 
 # We need to use Verilator 4.204+, so we install Verilator manually
-source ./install-verilator.sh
\ No newline at end of file
+source ./install-verilator.sh
diff --git a/setup.sh b/setup.sh
index 79747bfec..78848a719 100755
--- a/setup.sh
+++ b/setup.sh
@@ -15,12 +15,3 @@ echo NEMU_HOME: ${NEMU_HOME}
 echo AM_HOME: ${AM_HOME}
 echo NOOP_HOME: ${NOOP_HOME}
 
-cd ${NEMU_HOME}
-make riscv64-xs-ref_defconfig
-make -j
-
-# Use riscv64-linux-gnu- toolchain by default
-cd ${AM_HOME}/apps/coremark
-make ARCH=riscv64-xs LINUX_GNU_TOOLCHAIN=1 -k
-
-cd ${XS_PROJECT_ROOT}
\ No newline at end of file