Skip to content

Commit 886ff8b

Browse files
authored
fix: add proper filter sets for ci test runs (#875)
1 parent c5b5a7e commit 886ff8b

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/scripts/matrices.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ def main():
116116
os_str = f" ({target.target})"
117117

118118
name = case.name
119-
flags = f"-E '{case.filter}'"
119+
# NOTE(zk): filter out zk tests from upstream ci runs
120+
flags = f"-E '{case.filter} & not (test(~zk) or test(~test_zk_aave_di) or package(~zksync))'"
120121
if case.n_partitions > 1:
121122
s = f"{partition}/{case.n_partitions}"
122123
name += f" ({s})"

.github/workflows/nextest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ jobs:
9494
SVM_TARGET_PLATFORM: ${{ matrix.svm_target_platform }}
9595
HTTP_ARCHIVE_URLS: ${{ secrets.HTTP_ARCHIVE_URLS }}
9696
WS_ARCHIVE_URLS: ${{ secrets.WS_ARCHIVE_URLS }}
97-
run: cargo nextest run ${{ matrix.flags }} --filter-expr 'not (test(~zk) or test(~test_zk_aave_di))'
97+
run: cargo nextest run ${{ matrix.flags }}

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
RUST_BACKTRACE: full
141141
TEST_MAINNET_URL: http://localhost:8011
142142
run: |
143-
ZK_DEBUG_HISTORICAL_BLOCK_HASHES=5 cargo nextest run --package '*' --lib --test '*' --filter-expr 'test(~zk) and not test(~test_zk_aave_di)'
143+
ZK_DEBUG_HISTORICAL_BLOCK_HASHES=5 cargo nextest run --package '*' --lib --test '*' -E '(test(~zk) or package(~zksync)) and not test(~test_zk_aave_di)'
144144
145145
deny:
146146
uses: ithacaxyz/ci/.github/workflows/deny.yml@main

0 commit comments

Comments
 (0)