Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove contract versions defaults #25

Merged
merged 4 commits into from
Apr 29, 2024
Merged

Remove contract versions defaults #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bb04e0
Use nitro-contracts and token-bridge branches only if explicitly prov…
gvladika Apr 26, 2024
7e30058
Set original formatting
gvladika Apr 26, 2024
16c1de2
Temp commit to test local CI
gvladika Apr 26, 2024
209d0c3
Remove
gvladika Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/run-nitro-test-node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,3 @@ jobs:
- uses: ./run-nitro-test-node
with:
no-simple: false

15 changes: 10 additions & 5 deletions run-nitro-test-node/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@ inputs:
description: 'Whether to start an L3 node in addition to the L2 node'
nitro-contracts-branch:
required: false
default: 'main'
description: 'The nitro-contracts branch to use'
token-bridge-branch:
required: false
default: 'main'
description: 'The token-bridge-contracts branch to use'
runs:
using: 'composite'
Expand All @@ -51,8 +49,15 @@ runs:
# See https://stackoverflow.com/a/72203688 for more info
run: |
cd nitro-testnode
NITRO_CONTRACTS_BRANCH=${{ inputs.nitro-contracts-branch }} TOKEN_BRIDGE_BRANCH=${{ inputs.token-bridge-branch }} \
./test-node.bash --init ${{ inputs.no-simple == 'true' && '--no-simple' || '' }} \

if [ -n "${{ inputs.nitro-contracts-branch }}" ]; then
export NITRO_CONTRACTS_BRANCH="${{ inputs.nitro-contracts-branch }}"
fi
if [ -n "${{ inputs.token-bridge-branch }}" ]; then
export TOKEN_BRIDGE_BRANCH="${{ inputs.token-bridge-branch }}"
fi

./test-node.bash --init ${{ inputs.no-simple == 'true' && '--no-simple' || '' }} \
${{ 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' || '' }} \
Expand All @@ -75,4 +80,4 @@ runs:
- name: Wait for token bridge deployment
if: ${{ inputs.l3-node == 'true' && inputs.no-l3-token-bridge != 'true' }}
shell: bash
run: ${{ github.action_path }}/waitForTokenBridge.sh l2l3_network.json
run: ${{ github.action_path }}/waitForTokenBridge.sh l2l3_network.json
Loading