From 88816d1ce9c92aad9fb8c9246fd9a33e5f9e0078 Mon Sep 17 00:00:00 2001
From: Zhihao Xu <ngc7331@outlook.com>
Date: Sat, 5 Sep 2026 12:43:29 +0800
Subject: [PATCH 1/2] ci: use xs-env container & bump actions/checkout

to prevent installing deps repeatly
---
 .github/workflows/main.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6f438aba..3aefe808 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,10 +15,11 @@ on:
 jobs:
   test-nutshell:
     # The type of runner that the job will run on
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    container: ghcr.io/openxiangshan/xs-env:ubuntu-24.04
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - name: Prepare environment
         run: |
@@ -27,7 +28,6 @@ jobs:
             git config --global url."https://".insteadOf git://
             git clone https://github.com/OpenXiangShan/xs-env
             cd $GITHUB_WORKSPACE/../xs-env
-            sudo -s ./setup-tools.sh
             source ./setup.sh
             rm -r $GITHUB_WORKSPACE/../xs-env/NutShell
             cp -r $GITHUB_WORKSPACE $GITHUB_WORKSPACE/../xs-env
@@ -45,6 +45,7 @@ jobs:
             source ./env.sh
             make clean
             make verilog
+
       - name: Generate Verilog for FPGA
         run: |
             cd $GITHUB_WORKSPACE/../xs-env

From c7d456cee4783d0ec5c901f9d7f4617f3dd01d51 Mon Sep 17 00:00:00 2001
From: Zhihao Xu <ngc7331@outlook.com>
Date: Sat, 5 Sep 2026 13:03:28 +0800
Subject: [PATCH 2/2] ci: explicitly use bash

GitHub defaults to use `sh` instead of `bash` in container. See [docs](https://docs.github.com/en/actions/how-tos/write-workflows/choose-where-workflows-run/run-jobs-in-a-container). Resulting in some non-POSIX usage to fail.

Also see: https://github.com/OpenXiangShan/xs-env/pull/104
---
 .github/workflows/main.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3aefe808..7fa5d07c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,6 +17,9 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     container: ghcr.io/openxiangshan/xs-env:ubuntu-24.04
+    defaults:
+      run:
+        shell: bash
 
     steps:
       - uses: actions/checkout@v7