Skip to content

Commit 1408b00

Browse files
hexoscottrevitteth
andauthored
0tx block handling and moving to timers from tickers (#1673)
* 0tx block handling and moving to timers from tickers * tweak(ci): stable branches triggers (#1675) * run ci on stable branches * tweak(ci): lint docs on stable --------- Co-authored-by: Max Revitt <[email protected]> Co-authored-by: Max Revitt <[email protected]>
1 parent d5ce091 commit 1408b00

9 files changed

+242
-221
lines changed

.github/workflows/ci_zkevm.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ on:
44
branches:
55
- zkevm
66
- zkevm-2.60
7+
- stable/**
78
pull_request:
89
branches:
910
- zkevm
1011
- zkevm-2.60
11-
- stable*
12+
- stable/**
1213
types:
1314
- opened
1415
- reopened
@@ -142,7 +143,7 @@ jobs:
142143
docker run --network=host --volume "./tmp/:/config/" --env BRIDGE_TEST_CONFIG_FILE=/config/test.toml bridge-e2e-realnetwork-erc20
143144
144145
- name: Upload logs
145-
uses: actions/upload-artifact@v3
146+
uses: actions/upload-artifact@v4
146147
with:
147148
name: evm-rpc-tests-logs-${{ github.run_id }}
148149
path: ./cdk-erigon/logs/evm-rpc-tests.log
@@ -162,7 +163,7 @@ jobs:
162163
163164
- name: Upload logs
164165
if: failure()
165-
uses: actions/upload-artifact@v3
166+
uses: actions/upload-artifact@v4
166167
with:
167168
name: logs_${{ github.run_id }}
168169
path: ./kurtosis-cdk/ci_logs
@@ -185,7 +186,7 @@ jobs:
185186
run: /usr/local/bin/polycli loadtest --rpc-url "$(kurtosis port print cdk-v1 cdk-erigon-rpc-001 rpc)" --private-key "0x12d7de8621a77640c9241b2595ba78ce443d05e94090365ab3bb5e19df82c625" --verbosity 700 --requests 500 --rate-limit 50 --mode uniswapv3 --legacy
186187

187188
- name: Upload logs
188-
uses: actions/upload-artifact@v3
189+
uses: actions/upload-artifact@v4
189190
with:
190191
name: evm-rpc-tests-logs-${{ github.run_id }}
191192
path: ./cdk-erigon/logs/evm-rpc-tests.log
@@ -201,7 +202,7 @@ jobs:
201202
202203
- name: Upload logs
203204
if: failure()
204-
uses: actions/upload-artifact@v3
205+
uses: actions/upload-artifact@v4
205206
with:
206207
name: logs_${{ github.run_id }}
207208
path: ./kurtosis-cdk/ci_logs

.github/workflows/doc-rpc.yml

+2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ on:
33
push:
44
branches:
55
- zkevm
6+
- stable/**
67
pull_request:
78
branches:
89
- zkevm
10+
- stable/**
911
types:
1012
- opened
1113
- reopened

.github/workflows/nightly-ansible.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
cd zk/tests/ansible/evm-rpc-tests && docker compose build --quiet && docker compose up --exit-code-from ansible
3838
3939
- name: Upload logs
40-
uses: actions/upload-artifact@v3
40+
uses: actions/upload-artifact@v4
4141
with:
4242
name: evm-rpc-tests-logs-${{ matrix.nodes.name }}
4343
path: ./logs/evm-rpc-tests.log

.github/workflows/nightly-eth-bench.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
100100
- name: Upload benchmark log
101101
if: always()
102-
uses: actions/upload-artifact@v3
102+
uses: actions/upload-artifact@v4
103103
with:
104104
name: benchmark-log-${{ matrix.profile_name }}
105105
path: ./eth-bench/bench_${{ matrix.profile_name }}.log

.github/workflows/test-resequence.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ on:
33
push:
44
branches:
55
- zkevm
6+
- stable/**
67
pull_request:
78
branches:
89
- zkevm
10+
- stable/**
911
types:
1012
- opened
1113
- reopened
@@ -30,7 +32,7 @@ jobs:
3032
run: .github/scripts/test_resequence.sh
3133

3234
- name: Upload logs
33-
uses: actions/upload-artifact@v3
35+
uses: actions/upload-artifact@v4
3436
with:
3537
name: evm-rpc-tests-logs-${{ github.run_id }}
3638
path: ./cdk-erigon/logs/evm-rpc-tests.log
@@ -49,7 +51,7 @@ jobs:
4951
kurtosis service logs cdk-v1 zkevm-bridge-service-001 --all > zkevm-bridge-service-001.log
5052
- name: Upload logs
5153
if: failure()
52-
uses: actions/upload-artifact@v3
54+
uses: actions/upload-artifact@v4
5355
with:
5456
name: logs_${{ github.run_id }}
5557
path: ./kurtosis-cdk/ci_logs

.github/workflows/test-unwinds.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- zkevm
66
- zkevm-2.60
7+
- stable/**
78
workflow_dispatch:
89

910
jobs:

erigon-lib/.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ on:
33
push:
44
branches:
55
- main
6-
- stable
6+
- stable/**
77
- alpha
88
pull_request:
99
branches:
1010
- main
11-
- stable
11+
- stable/**
1212
- alpha
1313
env:
1414
CGO_ENABLED: "1"

0 commit comments

Comments
 (0)