Generated from https://github.com/vmactions/base-vm

vmactions · Dec 3, 2023 · 6528cb2 · 6528cb2
1 parent c0ffff0
commit 6528cb2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -40,7 +40,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Test in DragonflyBSD
       id: test
-      uses: vmactions/dragonflybsd-vm@07bafa8a6a264838c83239d20d2523bc326a3ac7
+      uses: vmactions/dragonflybsd-vm@c0ffff096365e7b4440bd653e27d00d99a6b722c
       with:
         envs: 'MYTOKEN MYTOKEN2'
         prepare: |
@@ -77,7 +77,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Test in DragonflyBSD
       id: test
-      uses: vmactions/dragonflybsd-vm@07bafa8a6a264838c83239d20d2523bc326a3ac7
+      uses: vmactions/dragonflybsd-vm@c0ffff096365e7b4440bd653e27d00d99a6b722c
       with:
         envs: 'MYTOKEN MYTOKEN2'
         prepare: |

diff --git a/index.js b/index.js
@@ -56,9 +56,7 @@ async function setup(nat, mem) {
 
     core.info("First boot");
 
-    await shell("bash run.sh waitForBooting");
-
-    await shell("bash run.sh waitForLoginTag");
+    await shell("bash run.sh waitForVMReady");
     core.endGroup();
 
     core.startGroup("Run onStarted in VM");

diff --git a/run.sh b/run.sh
@@ -116,14 +116,8 @@ importVM() {
 
 
 
-waitForLoginTag() {
-  if [ -e "hooks/waitForLoginTag.sh" ]; then
-    echo "Run hooks/waitForLoginTag.sh"
-    . hooks/waitForLoginTag.sh
-  else
-    bash $vmsh waitForText "$osname" "$VM_LOGIN_TAG"
-  fi
-
+waitForVMReady() {
+  bash $vmsh waitForVMReady "$osname"
 }
 
 
@@ -251,16 +245,6 @@ onBeforeStartVM() {
   fi
 }
 
-waitForBooting() {
-  #press enter for grub booting to speedup booting
-  if [ -e "hooks/waitForBooting.sh" ]; then
-    echo "Run hooks/waitForBooting.sh"
-    . hooks/waitForBooting.sh
-  else
-    echo "Skip hooks/waitForBooting.sh"
-  fi
-}
-
 
 showDebugInfo() {
   echo "==================Debug Info===================="