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
@@ -48,9 +50,8 @@ jobs:
           sudo apt remove kurtosis-cli
           sudo apt install kurtosis-cli=1.6.0 -V
       - name: Start optimism
-        run: |
-          make chain
-          make devnet-up
-          make set-port
-          make wait
-          make test
+        run: make devnet-up
+      - name: Wait for chain to get ready
+        run: make wait
+      - name: Test
+        run: make test

Makefile

@@ -1,7 +1,7 @@
 .PHONY: chain
 chain:
-	git clone --depth 1 -b v1.13.1 https://github.com/ethereum-optimism/optimism ./chain
-	sed 's/teku/lodestar/g' chain/kurtosis-devnet/simple.yaml > chain/kurtosis-devnet/simple.yaml.tmp
+#	git clone --depth 1 -b v1.13.1 https://github.com/ethereum-optimism/optimism ./chain
+	sed 's/teku/lodestar\n      cl_image: chainsafe\/lodestar:v1.29.0\n      vc_image: chainsafe\/lodestar:v1.29.0/g' chain/kurtosis-devnet/simple.yaml > chain/kurtosis-devnet/simple.yaml.tmp
 	sed 's/minimal/minimal\n    electra_fork_epoch: 0/g' chain/kurtosis-devnet/simple.yaml.tmp > chain/kurtosis-devnet/simple.yaml.tmp2
 	mv chain/kurtosis-devnet/simple.yaml.tmp2 chain/kurtosis-devnet/simple.yaml
 
@@ -42,8 +42,6 @@ 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