Skip to content

Commit

Permalink
Revert "Updates for the new testnode" (#21)
Browse files Browse the repository at this point in the history
* Revert "Updates for the new testnode (#20)"

This reverts commit 4e90f8e.

* Set old release
  • Loading branch information
yahgwai authored Feb 1, 2024
1 parent 4e90f8e commit d5dc1e1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 16 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/run-nitro-test-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,3 @@ 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

8 changes: 2 additions & 6 deletions run-nitro-test-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@ 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: ''
description: 'Additional args that can be supplied to the test node script'
nitro-testnode-ref:
required: false
default: 'release'
default: 'old-release-v2.1.1'
description: 'The nitro-testnode branch to use'
l3-node:
required: false
Expand All @@ -39,7 +35,7 @@ runs:
# See https://stackoverflow.com/a/72203688 for more info
run: |
cd nitro-testnode
./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 }} &
./test-node.bash --init ${{ inputs.l3-node == 'true' && '--l3node' || '' }} ${{ inputs.no-token-bridge == 'true' && '--no-tokenbridge' || '' }} ${{ inputs.args }} &
- name: Wait for nitro startup
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion run-nitro-test-node/waitForTokenBridge.sh
Original file line number Diff line number Diff line change
@@ -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 "if [ -f localNetwork.json ]; then cat localNetwork.json; else cat network.json; fi"
docker-compose -f ./nitro-testnode/docker-compose.yaml run --entrypoint sh tokenbridge -c "cat localNetwork.json"
if [ "$?" -eq "0" ]; then
exit 0
else
Expand Down

0 comments on commit d5dc1e1

Please sign in to comment.