Skip to content

Commit 0dadbe9

Browse files
authored
Merge branch 'arceos-hypervisor:next2' into next2
2 parents 152bc89 + 3d4602f commit 0dadbe9

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

.github/workflows/qemu-aarch64.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@ args = [
66
"virt,virtualization=on,gic-version=3",
77
"-smp",
88
"4",
9-
"-device",
10-
"virtio-blk-device,drive=disk0",
11-
"-drive",
12-
"id=disk0,if=none,format=raw,file=${ROOTFS_DIR}/rootfs.img",
139
"-append",
1410
"root=/dev/vda rw init=/init",
1511
"-m",
1612
"8g",
1713
]
1814
fail_regex = []
19-
success_regex = []
15+
success_regex = ["Hello, world!"]
2016
to_bin = true
2117
uefi = false

.github/workflows/test-qemu.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,10 @@ jobs:
4747
img_name="qemu-${{ matrix.arch }}"
4848
sed -i 's|^kernel_path[[:space:]]*=.*|kernel_path = "/tmp/axvisor/'"$img"'/'"$img_name"'"|' "$config"
4949
echo "Updated kernel_path in $config"
50-
51-
# Check if rootfs.img exists and export ROOTFS_DIR if it does
52-
if [ -f "/tmp/axvisor/$img/rootfs.img" ]; then
53-
ROOTFS_DIR="/tmp/axvisor/$img"
54-
echo "ROOTFS_DIR=$ROOTFS_DIR" >> $GITHUB_ENV
55-
echo "Found rootfs.img at /tmp/axvisor/$img/, exported ROOTFS_DIR=$ROOTFS_DIR"
56-
fi
5750
done
5851
5952
- name: Run tests
6053
run: |
61-
export ROOTFS_DIR="${{ env.ROOTFS_DIR }}"
6254
export RUST_LOG=debug
6355
cargo xtask qemu \
6456
--build-config configs/board/qemu-${{ matrix.arch }}.toml \

0 commit comments

Comments
 (0)