Retry Ubuntu runner

magao-x · Aug 15, 2024 · f2851a0 · f2851a0
1 parent 1672e4c
commit f2851a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/build-vm-arm.yml b/.github/workflows/build-vm-arm.yml
@@ -11,7 +11,7 @@ env:
   vmArch: aarch64
 jobs:
   build-arm-stage1:
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
@@ -69,7 +69,7 @@ jobs:
           name: arm_stage1_vm
           path: setup/xvm/stage1_outputs.tar
   build-arm-stage2:
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     needs: build-arm-stage1
     permissions:
       contents: read
@@ -125,7 +125,7 @@ jobs:
           name: arm_stage2_vm
           path: setup/xvm/stage2_outputs.tar
   build-arm-stage3:
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     needs: build-arm-stage2
     permissions:
       contents: read

diff --git a/setup/xvm/_common.sh b/setup/xvm/_common.sh
@@ -14,12 +14,10 @@ fi
 export cpuType accelFlag
 
 qemuDisplay=${qemuDisplay:-}
-if [[ $qemuDisplay == serial ]]; then
-    ioFlag="-serial stdio"
-elif [[ ! -z $qemuDisplay ]]; then
+if [[ ! -z $qemuDisplay ]]; then
     ioFlag="-display $qemuDisplay"
 else
-    ioFlag=''
+    ioFlag='-serial stdio'
 fi
 export ioFlag