test: try

OffchainLabs · Oct 28, 2024 · 08e07da · 08e07da
1 parent 8bc4770
commit 08e07da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml
@@ -61,7 +61,7 @@ runs:
           ${{ inputs.l3-node == 'true' && '--l3node' || '' }} \
           ${{ inputs.no-token-bridge == 'true' && '--no-tokenbridge' || '--tokenbridge' }} \
           ${{ inputs.l3-node == 'true' && inputs.no-l3-token-bridge != 'true' && '--l3-token-bridge' || '' }} \
-          ${{ inputs.args }} > ${{ runner.temp }}/test-node.log &
+          ${{ inputs.args }} >${{ runner.temp }}/test-node.log 2>&1 &
 
     - name: Wait for nitro startup
       shell: bash

diff --git a/run-nitro-test-node/waitForNitro.sh b/run-nitro-test-node/waitForNitro.sh
@@ -15,13 +15,9 @@ do
     exit 0
   else
     # echo "nitro not ready yet at port $PORT"
-    if ! pgrep -f "test-node.bash" > /dev/null; then
-        echo "Script test-node.bash is not running."
-        cat $RUNNER_TEMP/test-node.log
-        exit 1
-    fi
     sleep 10
   fi
 done
+cat $RUNNER_TEMP/test-node.log
 docker compose -f ./nitro-testnode/docker-compose.yaml logs
-exit 1
+exit 1
diff --git a/run-nitro-test-node/waitForTokenBridge.sh b/run-nitro-test-node/waitForTokenBridge.sh
@@ -7,13 +7,9 @@ do
     exit 0
   else
     echo "token bridge not ready yet $1"
-    # if ! pgrep -f "test-node.bash" > /dev/null; then
-    #     echo "Script test-node.bash is not running."
-    #     cat $RUNNER_TEMP/test-node.log
-    #     exit 1
-    # fi
     sleep 10
   fi
 done
+cat $RUNNER_TEMP/test-node.log
 docker compose -f ./nitro-testnode/docker-compose.yaml logs tokenbridge
-exit 1
+exit 1