diff --git a/.github/workflows/run-nitro-test-node.yml b/.github/workflows/run-nitro-test-node.yml index 840ecc4..26025e7 100644 --- a/.github/workflows/run-nitro-test-node.yml +++ b/.github/workflows/run-nitro-test-node.yml @@ -21,14 +21,14 @@ jobs: with: no-token-bridge: true - run-with-args: - name: "Run with args" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ./run-nitro-test-node - with: - args: --detach + # run-with-args: + # name: "Run with args" + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - uses: ./run-nitro-test-node + # with: + # args: --detach run-with-simple: name: "Run in simple mode" diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 7148f78..93d9e49 100644 --- 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 2>&1 & + ${{ inputs.args }} --detach - name: Wait for nitro startup shell: bash diff --git a/run-nitro-test-node/waitForNitro.sh b/run-nitro-test-node/waitForNitro.sh index e61d5b6..d33ba85 100755 --- a/run-nitro-test-node/waitForNitro.sh +++ b/run-nitro-test-node/waitForNitro.sh @@ -5,19 +5,15 @@ PORT=${1:-8547} # timeout after around 10 minutes for i in {1..60} do - # dirty way to print and truncate the log file - # some lines can be missing due to race condition - cat $RUNNER_TEMP/test-node.log - : > $RUNNER_TEMP/test-node.log curl --silent -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":45678,"method":"eth_chainId","params":[]}' "http://localhost:$PORT" if [ "$?" -eq "0" ]; then echo "nitro ready at port $PORT" exit 0 else - # echo "nitro not ready yet at port $PORT" + echo "nitro not ready yet at port $PORT" sleep 10 fi done -cat $RUNNER_TEMP/test-node.log +echo "exiting: printing docker logs" docker compose -f ./nitro-testnode/docker-compose.yaml logs exit 1 diff --git a/run-nitro-test-node/waitForTokenBridge.sh b/run-nitro-test-node/waitForTokenBridge.sh index d9e20fa..b88c13a 100755 --- a/run-nitro-test-node/waitForTokenBridge.sh +++ b/run-nitro-test-node/waitForTokenBridge.sh @@ -10,6 +10,6 @@ do sleep 10 fi done -cat $RUNNER_TEMP/test-node.log +echo "exiting: printing docker logs" docker compose -f ./nitro-testnode/docker-compose.yaml logs tokenbridge exit 1