From 984e1effee39f9bcb69e8e099c765b14906da6a4 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 04:51:34 +0900 Subject: [PATCH 01/25] feat: use detach --- run-nitro-test-node/action.yml | 2 +- run-nitro-test-node/waitForNitro.sh | 10 ++++++++-- run-nitro-test-node/waitForTokenBridge.sh | 7 ++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 2b0d5a7..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 }} & + ${{ 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 8e212ba..d33ba85 100755 --- a/run-nitro-test-node/waitForNitro.sh +++ b/run-nitro-test-node/waitForNitro.sh @@ -2,12 +2,18 @@ PORT=${1:-8547} -while true +# timeout after around 10 minutes +for i in {1..60} do - curl -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":45678,"method":"eth_chainId","params":[]}' "http://localhost:$PORT" + 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" sleep 10 fi done +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 3346625..b88c13a 100755 --- a/run-nitro-test-node/waitForTokenBridge.sh +++ b/run-nitro-test-node/waitForTokenBridge.sh @@ -1,10 +1,15 @@ # poll the token bridge deployment file until we get a 0 return code -while true +# timeout after around 10 minutes +for i in {1..60} do docker compose -f ./nitro-testnode/docker-compose.yaml run --entrypoint sh tokenbridge -c "cat $1" if [ "$?" -eq "0" ]; then exit 0 else + echo "token bridge not ready yet $1" sleep 10 fi done +echo "exiting: printing docker logs" +docker compose -f ./nitro-testnode/docker-compose.yaml logs tokenbridge +exit 1 From 4be487a0997c0e762a6f4e0c29695f38c64936f0 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 04:51:51 +0900 Subject: [PATCH 02/25] fix: typo --- .github/workflows/run-nitro-test-node.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-nitro-test-node.yml b/.github/workflows/run-nitro-test-node.yml index 03bcb1f..840ecc4 100644 --- a/.github/workflows/run-nitro-test-node.yml +++ b/.github/workflows/run-nitro-test-node.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./run-nitro-test-node - run-with-token-bridge: + run-without-token-bridge: name: "Run without token bridge deployment" runs-on: ubuntu-latest steps: From 7ac307db8d9a0916fbe8130c55b836af8751cef3 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 04:52:11 +0900 Subject: [PATCH 03/25] ci: test some other args --- .github/workflows/run-nitro-test-node.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-nitro-test-node.yml b/.github/workflows/run-nitro-test-node.yml index 840ecc4..da9ede3 100644 --- a/.github/workflows/run-nitro-test-node.yml +++ b/.github/workflows/run-nitro-test-node.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./run-nitro-test-node with: - args: --detach + args: --pos run-with-simple: name: "Run in simple mode" From b05e0ec038eb65c94234977648f0f7c6da5e4d04 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 04:54:59 +0900 Subject: [PATCH 04/25] chore: reduce timeout --- run-nitro-test-node/waitForNitro.sh | 4 ++-- run-nitro-test-node/waitForTokenBridge.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/run-nitro-test-node/waitForNitro.sh b/run-nitro-test-node/waitForNitro.sh index d33ba85..830c7d9 100755 --- a/run-nitro-test-node/waitForNitro.sh +++ b/run-nitro-test-node/waitForNitro.sh @@ -2,8 +2,8 @@ PORT=${1:-8547} -# timeout after around 10 minutes -for i in {1..60} +# timeout after around 1 minutes, should be enough because test-node.bash only detach after everything is ready +for i in {1..6} do 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 diff --git a/run-nitro-test-node/waitForTokenBridge.sh b/run-nitro-test-node/waitForTokenBridge.sh index b88c13a..8066964 100755 --- a/run-nitro-test-node/waitForTokenBridge.sh +++ b/run-nitro-test-node/waitForTokenBridge.sh @@ -1,6 +1,6 @@ # poll the token bridge deployment file until we get a 0 return code -# timeout after around 10 minutes -for i in {1..60} +# timeout after around 1 minutes, should be enough because test-node.bash only detach after everything is ready +for i in {1..6} do docker compose -f ./nitro-testnode/docker-compose.yaml run --entrypoint sh tokenbridge -c "cat $1" if [ "$?" -eq "0" ]; then From e93d594c966d909948495dd87377d4f438a1d581 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 04:56:50 +0900 Subject: [PATCH 05/25] chore: remove old comment --- run-nitro-test-node/action.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 93d9e49..967035d 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -44,9 +44,6 @@ runs: - name: Start background nitro-testnode test-node.bash shell: bash - # Currently, you can't run parallel steps, so we add the "&" to run this step in the background - # - # See https://stackoverflow.com/a/72203688 for more info run: | cd nitro-testnode From 246e5a0a917e77653e16a596d757776d447856f8 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 04:58:25 +0900 Subject: [PATCH 06/25] chore: better message --- run-nitro-test-node/waitForNitro.sh | 2 +- run-nitro-test-node/waitForTokenBridge.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run-nitro-test-node/waitForNitro.sh b/run-nitro-test-node/waitForNitro.sh index 830c7d9..ffa8ef7 100755 --- a/run-nitro-test-node/waitForNitro.sh +++ b/run-nitro-test-node/waitForNitro.sh @@ -14,6 +14,6 @@ do sleep 10 fi done -echo "exiting: printing docker logs" +echo "exiting: printing docker logs for everything" 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 8066964..47519e7 100755 --- a/run-nitro-test-node/waitForTokenBridge.sh +++ b/run-nitro-test-node/waitForTokenBridge.sh @@ -10,6 +10,6 @@ do sleep 10 fi done -echo "exiting: printing docker logs" +echo "exiting: printing docker logs for tokenbridge deployment" docker compose -f ./nitro-testnode/docker-compose.yaml logs tokenbridge exit 1 From f62228f9eab26d4e7374d7f172512683c66d4d0a Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 05:12:42 +0900 Subject: [PATCH 07/25] feat: use new ci flag for better caching --- run-nitro-test-node/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 967035d..f02a46d 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -58,7 +58,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 }} --detach + ${{ inputs.args }} --detach --ci - name: Wait for nitro startup shell: bash From 72b53bb9181312b3f38a0abec67c6b8fb2e40a88 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 05:16:21 +0900 Subject: [PATCH 08/25] feat: add caching --- run-nitro-test-node/action.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index f02a46d..fce949d 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -19,7 +19,7 @@ inputs: description: "Additional args that can be supplied to the test node script" nitro-testnode-ref: required: false - default: "release" + default: "docker-layer" description: "The nitro-testnode branch to use" l3-node: required: false @@ -42,6 +42,13 @@ runs: path: "nitro-testnode" ref: ${{ inputs.nitro-testnode-ref }} + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} + restore-keys: ${{ runner.os }}-buildx- + - name: Start background nitro-testnode test-node.bash shell: bash run: | From 1ecafe5d562fc1c9b5a90aa4f824a92b3587330b Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 05:28:33 +0900 Subject: [PATCH 09/25] chore: use release --- run-nitro-test-node/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index fce949d..afb4a05 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -19,7 +19,7 @@ inputs: description: "Additional args that can be supplied to the test node script" nitro-testnode-ref: required: false - default: "docker-layer" + default: "release" description: "The nitro-testnode branch to use" l3-node: required: false From 3f3fa100409d721173aebed0aa74ceb4f50d4d06 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 05:29:25 +0900 Subject: [PATCH 10/25] fix: remove caching in action --- run-nitro-test-node/action.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index afb4a05..f02a46d 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -42,13 +42,6 @@ runs: path: "nitro-testnode" ref: ${{ inputs.nitro-testnode-ref }} - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} - restore-keys: ${{ runner.os }}-buildx- - - name: Start background nitro-testnode test-node.bash shell: bash run: | From 3e13c94d878c956848840d597aedc1703a0ee446 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 05:31:23 +0900 Subject: [PATCH 11/25] ci: test caching --- .github/workflows/run-nitro-test-node.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/run-nitro-test-node.yml b/.github/workflows/run-nitro-test-node.yml index da9ede3..9de62c7 100644 --- a/.github/workflows/run-nitro-test-node.yml +++ b/.github/workflows/run-nitro-test-node.yml @@ -5,6 +5,19 @@ on: workflow_dispatch: jobs: + run-with-caching: + name: "Run with caching" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: ${{ runner.os }}-buildx- + - uses: ./run-nitro-test-node + run-with-defaults: name: "Run with defaults" runs-on: ubuntu-latest From 2b324e0b886c08e773365a916cc822e33da8c56d Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 05:58:34 +0900 Subject: [PATCH 12/25] test: buildx --- .github/workflows/run-nitro-test-node.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/run-nitro-test-node.yml b/.github/workflows/run-nitro-test-node.yml index 9de62c7..b243f19 100644 --- a/.github/workflows/run-nitro-test-node.yml +++ b/.github/workflows/run-nitro-test-node.yml @@ -10,6 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + driver-opts: network=host - name: Cache Docker layers uses: actions/cache@v3 with: From d00dd7163456a95c9bf6ce3fcf1e000e3181d59c Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 06:03:56 +0900 Subject: [PATCH 13/25] test: move caching to action --- .github/workflows/run-nitro-test-node.yml | 17 ----------------- run-nitro-test-node/action.yml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/run-nitro-test-node.yml b/.github/workflows/run-nitro-test-node.yml index b243f19..da9ede3 100644 --- a/.github/workflows/run-nitro-test-node.yml +++ b/.github/workflows/run-nitro-test-node.yml @@ -5,23 +5,6 @@ on: workflow_dispatch: jobs: - run-with-caching: - name: "Run with caching" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - driver-opts: network=host - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: ${{ runner.os }}-buildx- - - uses: ./run-nitro-test-node - run-with-defaults: name: "Run with defaults" runs-on: ubuntu-latest diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index f02a46d..e88b80e 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -42,6 +42,18 @@ runs: path: "nitro-testnode" ref: ${{ inputs.nitro-testnode-ref }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + driver-opts: network=host + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: ${{ runner.os }}-buildx- + - name: Start background nitro-testnode test-node.bash shell: bash run: | From 535b9c47755791ff89f4f8456c371ed52e7efa85 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 06:22:32 +0900 Subject: [PATCH 14/25] fix: remove caching --- run-nitro-test-node/action.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index e88b80e..f02a46d 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -42,18 +42,6 @@ runs: path: "nitro-testnode" ref: ${{ inputs.nitro-testnode-ref }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - driver-opts: network=host - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ github.sha }} - restore-keys: ${{ runner.os }}-buildx- - - name: Start background nitro-testnode test-node.bash shell: bash run: | From 6ea39527eda988fce7b62ae72aeb30251d9a9477 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 06:36:38 +0900 Subject: [PATCH 15/25] chore: debug --- run-nitro-test-node/action.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index f02a46d..9a0ef90 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -19,7 +19,7 @@ inputs: description: "Additional args that can be supplied to the test node script" nitro-testnode-ref: required: false - default: "release" + default: "gz-debug" description: "The nitro-testnode branch to use" l3-node: required: false @@ -42,6 +42,18 @@ runs: path: "nitro-testnode" ref: ${{ inputs.nitro-testnode-ref }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + driver-opts: network=host + + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} + restore-keys: ${{ runner.os }}-buildx- + - name: Start background nitro-testnode test-node.bash shell: bash run: | From 9f94aa4ad03731bebbaa3e5eede25356d50242ad Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 06:40:13 +0900 Subject: [PATCH 16/25] fix: use init-force --- run-nitro-test-node/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 9a0ef90..65f93ba 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -66,7 +66,7 @@ runs: export TOKEN_BRIDGE_BRANCH="${{ inputs.token-bridge-branch }}" fi - ./test-node.bash --init ${{ inputs.no-simple == 'true' && '--no-simple' || '' }} \ + ./test-node.bash --init-force ${{ 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' || '' }} \ From 736ccd189a7c46c273d48c90898d42b1bd2496e1 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 06:45:04 +0900 Subject: [PATCH 17/25] chore: switch to release --- run-nitro-test-node/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 65f93ba..7ac2ec9 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -19,7 +19,7 @@ inputs: description: "Additional args that can be supplied to the test node script" nitro-testnode-ref: required: false - default: "gz-debug" + default: "release" description: "The nitro-testnode branch to use" l3-node: required: false From 9580e0623f96726ffbf1c1559fcb9c654fa41998 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 14:17:26 +0900 Subject: [PATCH 18/25] test: use another ref --- run-nitro-test-node/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 7ac2ec9..65f93ba 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -19,7 +19,7 @@ inputs: description: "Additional args that can be supplied to the test node script" nitro-testnode-ref: required: false - default: "release" + default: "gz-debug" description: "The nitro-testnode branch to use" l3-node: required: false From 796a4f67a7044112e5ae2c8db653d923584fd14a Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 15:52:51 +0900 Subject: [PATCH 19/25] feat: add nowait --- run-nitro-test-node/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 65f93ba..ed44dc0 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -70,7 +70,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 }} --detach --ci + ${{ inputs.args }} --detach --nowait --ci - name: Wait for nitro startup shell: bash From 355ae133ad17efb0e1e156aa08c18da496b97058 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 16:42:39 +0900 Subject: [PATCH 20/25] feat: gha cache --- run-nitro-test-node/action.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index ed44dc0..2599f5f 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -19,7 +19,7 @@ inputs: description: "Additional args that can be supplied to the test node script" nitro-testnode-ref: required: false - default: "gz-debug" + default: "gz-debug-gha" description: "The nitro-testnode branch to use" l3-node: required: false @@ -45,15 +45,9 @@ runs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: + driver: docker-container driver-opts: network=host - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} - restore-keys: ${{ runner.os }}-buildx- - - name: Start background nitro-testnode test-node.bash shell: bash run: | From 2f98fa8f6c85d8f5ad1136df5ab8d77a810c1f11 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 16:56:52 +0900 Subject: [PATCH 21/25] revert: "feat: gha cache" This reverts commit 355ae133ad17efb0e1e156aa08c18da496b97058. --- run-nitro-test-node/action.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 2599f5f..ed44dc0 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -19,7 +19,7 @@ inputs: description: "Additional args that can be supplied to the test node script" nitro-testnode-ref: required: false - default: "gz-debug-gha" + default: "gz-debug" description: "The nitro-testnode branch to use" l3-node: required: false @@ -45,9 +45,15 @@ runs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: - driver: docker-container driver-opts: network=host + - name: Cache Docker layers + uses: actions/cache@v3 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} + restore-keys: ${{ runner.os }}-buildx- + - name: Start background nitro-testnode test-node.bash shell: bash run: | From 65be0fa737ec7a158889e50919c043a4c3af2954 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 18:35:00 +0900 Subject: [PATCH 22/25] chore: no cache test --- run-nitro-test-node/action.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index ed44dc0..e9984f5 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -42,18 +42,6 @@ runs: path: "nitro-testnode" ref: ${{ inputs.nitro-testnode-ref }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - driver-opts: network=host - - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} - restore-keys: ${{ runner.os }}-buildx- - - name: Start background nitro-testnode test-node.bash shell: bash run: | @@ -70,7 +58,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 }} --detach --nowait --ci + ${{ inputs.args }} --detach --nowait - name: Wait for nitro startup shell: bash From fb5dece549f10767d9812d86320ed1392a7d3a27 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 18:42:19 +0900 Subject: [PATCH 23/25] chore: use release --- run-nitro-test-node/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index e9984f5..0c2f620 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -19,7 +19,7 @@ inputs: description: "Additional args that can be supplied to the test node script" nitro-testnode-ref: required: false - default: "gz-debug" + default: "release" description: "The nitro-testnode branch to use" l3-node: required: false From 70495799e3b023b8338da629bcd00091e5e39ea2 Mon Sep 17 00:00:00 2001 From: gzeon Date: Tue, 29 Oct 2024 18:43:02 +0900 Subject: [PATCH 24/25] chore: use gzdebug due to nowait --- run-nitro-test-node/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index 0c2f620..e9984f5 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -19,7 +19,7 @@ inputs: description: "Additional args that can be supplied to the test node script" nitro-testnode-ref: required: false - default: "release" + default: "gz-debug" description: "The nitro-testnode branch to use" l3-node: required: false From 06e01eae326b30e96ee4aa2ddd2190d023421e7a Mon Sep 17 00:00:00 2001 From: Chris Buckland Date: Tue, 14 Jan 2025 11:19:16 +0000 Subject: [PATCH 25/25] Set testnode ref to main --- run-nitro-test-node/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-nitro-test-node/action.yml b/run-nitro-test-node/action.yml index e9984f5..0c2f620 100644 --- a/run-nitro-test-node/action.yml +++ b/run-nitro-test-node/action.yml @@ -19,7 +19,7 @@ inputs: description: "Additional args that can be supplied to the test node script" nitro-testnode-ref: required: false - default: "gz-debug" + default: "release" description: "The nitro-testnode branch to use" l3-node: required: false