diff --git a/.github/workflows/run-nitro-test-node.yml b/.github/workflows/run-nitro-test-node.yml index 67a5b81..ba0cc05 100644 --- a/.github/workflows/run-nitro-test-node.yml +++ b/.github/workflows/run-nitro-test-node.yml @@ -30,3 +30,12 @@ jobs: with: args: --detach + run-with-simple: + name: 'Run in simple mode' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: ./run-nitro-test-node + with: + no-simple: false + diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 686c9b7..ac9e873 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -5,6 +5,10 @@ inputs: required: false default: 'false' description: 'Whether to skip deploying the token bridge on the test node' + no-simple: + required: false + default: 'true' + description: 'Whether to start the test node in simple mode' args: required: false default: '' @@ -35,7 +39,7 @@ runs: # See https://stackoverflow.com/a/72203688 for more info run: | cd nitro-testnode - ./test-node.bash --init ${{ inputs.l3-node == 'true' && '--l3node' || '' }} ${{ inputs.no-token-bridge == 'true' && '--no-tokenbridge' || '' }} ${{ inputs.args }} & + ./test-node.bash --init ${{ inputs.no-simple == 'true' && '--no-simple' || '' }} ${{ inputs.l3-node == 'true' && '--l3node' || '' }} ${{ inputs.no-token-bridge == 'true' && '--no-tokenbridge' || '--tokenbridge' }} ${{ inputs.args }} & - name: Wait for nitro startup shell: bash diff --git a/run-nitro-test-node/waitForTokenBridge.sh b/run-nitro-test-node/waitForTokenBridge.sh index 68f403c..1c386e2 100755 --- a/run-nitro-test-node/waitForTokenBridge.sh +++ b/run-nitro-test-node/waitForTokenBridge.sh @@ -1,7 +1,7 @@ # poll the token bridge deployment file until we get a 0 return code while true do - docker-compose -f ./nitro-testnode/docker-compose.yaml run --entrypoint sh tokenbridge -c "cat localNetwork.json" + docker-compose -f ./nitro-testnode/docker-compose.yaml run --entrypoint sh tokenbridge -c "if [ -f localNetwork.json ]; then cat localNetwork.json; else cat network.json; fi" if [ "$?" -eq "0" ]; then exit 0 else