Skip to content

Commit 253f3d6

Browse files
committed
ci
1 parent 2cf40f2 commit 253f3d6

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
- name: Checkout Repository
100100
uses: actions/checkout@v4
101101
with:
102-
submodules: 'recursive' # 确保检出所有子模块
102+
submodules: 'recursive'
103103

104104
- name: Set up environment variables
105105
run: |
@@ -115,25 +115,20 @@ jobs:
115115
HVISOR_TOOL_DIR="${{ github.workspace }}/platform/${{ matrix.arch }}/${{ matrix.board }}/image/virtdisk/hvisor-tool"
116116
117117
# 2. 确定传递给 hvisor-tool Makefile 的架构参数
118-
local MAKE_ARCH=""
118+
MAKE_ARCH="" # 修正:移除 local 关键字
119119
if [ "${{ matrix.arch }}" == "aarch64" ]; then
120120
MAKE_ARCH="arm64"
121121
elif [ "${{ matrix.arch }}" == "riscv64" ]; then
122122
MAKE_ARCH="riscv"
123123
fi
124124
125125
# 3. 在隔离的环境中执行构建
126-
# 我们不设置 CC 或 CFLAGS,让 hvisor-tool 的 Makefile 自己决定。
127-
# 我们只提供它需要的参数:ARCH 和 LIBC。
128-
# 这是解决环境污染问题的核心。
129126
make -C "${HVISOR_TOOL_DIR}/tools" all ARCH=${MAKE_ARCH} LIBC=gnu
130127
131128
echo "--- hvisor-tool build complete ---"
132129
133130
# 关键修复:告诉主构建脚本跳过它自己的 hvisor-tool 构建步骤
134131
- name: Run System Test (skipping tool build)
135132
run: |
136-
# 设置一个环境变量,让 'make stest' 跳过它内部的 build_hvisor_tool 步骤
137-
# 注意:这需要你的顶层 Makefile 或者相关脚本能够识别这个变量
138133
export SKIP_HVISOR_TOOL_BUILD=true
139-
make stest
134+
make stest```

0 commit comments

Comments
 (0)