change CI

Author: yoshidan

.github/workflows/ci.yaml

@@ -10,6 +10,7 @@ on:
 jobs:
   lint:
     name: lint
+    timeout-minutes: 20
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -27,6 +28,7 @@ jobs:
         run: cargo machete
   test:
     name: test
+    timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -47,10 +49,13 @@ jobs:
           sudo apt update
           sudo apt remove kurtosis-cli
           sudo apt install kurtosis-cli=1.6.0 -V
-      - name: Start optimism
+      - name: Prepare optimism
         run: |
           make chain
-          make devnet-up
-          make set-port
-          make wait
-          make test
+          make devnet-prepare
+      - name: Start optimism
+        run: make devnet-up
+      - name: Wait for chain to get ready
+        run: make wait
+      - name: Test
+        run: make test

Makefile

@@ -9,6 +9,13 @@ chain:
 devnet-up:
 	cd chain/kurtosis-devnet && just simple-devnet
 
+.PHONY: devnet-prepare
+devnet-prepare:
+	# For the purpose of avoiding the first devnet-up failure
+	# Failed to startup right after cloning the repo
+	make devnet-up || echo "stop devnet"
+	make devnet-down
+
 .PHONY: set-port
 set-port:
 	scripts/port.sh
@@ -42,8 +49,7 @@ test:
 
 .PHONY: devnet-down
 devnet-down:
-	kurtosis engine restart
-	@ENCLAVE=$$(kurtosis enclave ls | awk 'NR==2 {print $$1}'); kurtosis enclave stop $$ENCLAVE
+	@ENCLAVE=$$(kurtosis enclave ls | awk 'NR==2 {print $$1}'); kurtosis enclave rm -f $$ENCLAVE
 	kurtosis engine stop
 	docker network rm kt-simple-devnet
 

scripts/wait.sh

@@ -9,7 +9,7 @@ do
   if [ $L2_NUMBER -gt 200 ]; then
     exit 0
   fi
-  echo "waiting for L2 number to be greater than 100"
+  echo "waiting for L2 number to be greater than 200"
   sleep 10
 done
 exit 1