Merge branch 'release' into decouple-contracts

OffchainLabs · Apr 23, 2024 · c97a489 · c97a489
2 parents 4197b54 + e530842
commit c97a489
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash
@@ -3,10 +3,9 @@
 # until send-l2 succeeds.
 
 # Start the test node and get PID, to terminate it once send-l2 is done.
-${GITHUB_WORKSPACE}/test-node.bash --init > output.log 2>&1 &
-PID=$!
+cd ${GITHUB_WORKSPACE}
 
-sleep 5m
+./test-node.bash --init-force --detach
 
 START=$(date +%s)
 SUCCEDED=0
@@ -29,11 +28,10 @@ while true; do
     sleep 10
 done
 
-# Shut down the test node and wait for it to terminate.
-kill $PID
-wait $PID
+docker-compose stop
 
 if [ "$SUCCEDED" -eq 0 ]; then
+    docker-compose logs
     exit 1
 fi
 

diff --git a/test-node.bash b/test-node.bash
@@ -2,7 +2,7 @@
 
 set -e
 
-NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.2.2-8f33fea-dev
+NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.3.3-6a1c1a7-dev
 BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1
 
 mydir=`dirname $0`
@@ -54,6 +54,10 @@ while [[ $# -gt 0 ]]; do
             fi
             shift
             ;;
+        --init-force)
+            force_init=true
+            shift
+            ;;
         --dev)
             simple=false
             shift