Merge conflicts

matter-labs · Feb 11, 2025 · a862705 · a862705
2 parents 8a768f9 + 67be473
commit a862705
Show file tree

Hide file tree

Showing 126 changed files with 4,261 additions and 2,966 deletions.
diff --git a/.github/changelog.json b/.github/changelog.json
@@ -61,6 +61,6 @@
     "template": "${{CHANGELOG}}\n## Other\n\n${{UNCATEGORIZED}}\n## Full Changelog:\n ${{RELEASE_DIFF}}",
     "pr_template": "- ${{TITLE}} (#${{NUMBER}}) by @${{AUTHOR}}",
     "empty_template": "- No changes",
-    "max_pull_requests": 100,
-    "max_back_track_time_days": 60
+    "max_pull_requests": 500,
+    "max_back_track_time_days": 120
 }
diff --git a/.github/scripts/matrices.py b/.github/scripts/matrices.py
@@ -84,19 +84,19 @@ def __init__(
     ),
     Case(
         name="integration",
-        filter="kind(test) & !test(/issue|forge_std|ext_integration/)",
+        filter="kind(test) & !test(/\\b(issue|ext_integration)/)",
         n_partitions=3,
         pr_cross_platform=True,
     ),
     Case(
         name="integration / issue-repros",
-        filter="package(=forge) & test(~issue)",
+        filter="package(=forge) & test(/\\bissue/)",
         n_partitions=2,
         pr_cross_platform=False,
     ),
     Case(
         name="integration / external",
-        filter="package(=forge) & test(~ext_integration)",
+        filter="package(=forge) & test(/\\bext_integration/)",
         n_partitions=2,
         pr_cross_platform=False,
     ),

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -145,10 +145,6 @@ jobs:
 
   deny:
     uses: ithacaxyz/ci/.github/workflows/deny.yml@main
-    with:
-      # Clear out arguments to not pass `--all-features` to `cargo deny`.
-      # Many crates have an `openssl` feature which enables banned dependencies.
-      deny-flags: ""
 
 
   check-ci-install: