From 7576cbd8b9fa45887c37b5fd25c89f3284b4aecc Mon Sep 17 00:00:00 2001
From: Aztec Bot <49558828+AztecBot@users.noreply.github.com>
Date: Thu, 11 Jun 2026 05:56:48 +0000
Subject: [PATCH] chore(ci): public nightlies skip scenario tests and the next
 tag (#23984)

Two changes scoped to the **public** repo
(`AztecProtocol/aztec-packages`) nightly flow, plus a follow-up
tightening of the scenario-test trigger. Private tagging is unchanged.

`ci3.yml`'s `ci-network-scenario` job fired on any current nightly tag
in both repos. Private produces both a `next` (v6) and a `v5-next` (v5)
nightly tag, so simply gating to the private repo still ran scenarios
against the v6 nightly. The nightly-triggered path is now gated to
**private repo + a `v5.` nightly tag**:

```yaml
(
  needs.validate-nightly-tag.outputs.is_current == 'true'
  && github.repository == 'AztecProtocol/aztec-packages-private'
  && startsWith(github.ref_name, 'v5.')
)
|| contains(github.event.pull_request.labels.*.name, 'ci-network-scenario')
```

`v5-next` is at `5.x.x` (tag `v5.x.x-nightly.*`) and `next` is at
`6.x.x` (tag `v6.x.x-nightly.*`), so `startsWith(github.ref_name,
'v5.')` selects the v5-next nightly only. The manual PR-label path
(`ci-network-scenario`) is preserved for ad-hoc dev runs.

`nightly-release-tag.yml`'s matrix tagged `[next, v5-next]` in both
repos. The branch list is now repo-dependent: private keeps `[next,
v5-next]`, public tags only `v5-next` (and `v4-next` via its existing
dedicated job). Net result: **public tags `v4-next` + `v5-next` only**,
private is untouched.

Nightly network scenario tests should run only against the private
v5-next nightly, and public should not produce a `next` nightly tag.
---
 .github/workflows/ci3.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci3.yml b/.github/workflows/ci3.yml
index 8cd1128fddbc..c59d57109ae3 100644
--- a/.github/workflows/ci3.yml
+++ b/.github/workflows/ci3.yml
@@ -208,7 +208,7 @@ jobs:
       fail-fast: false
       matrix:
         test_set: ["1", "2"]
-    # We run on current nightly tags only, or when the ci-network-scenario label is present in a PR.
+    # We run on the current v5-next nightly tag (private repo only), or when the ci-network-scenario label is present in a PR.
     needs: [ci, validate-nightly-tag]
     if: |
       always()
@@ -216,7 +216,11 @@ jobs:
       && github.event.pull_request.head.repo.fork != true
       && github.event.pull_request.draft == false
       && (
-        needs.validate-nightly-tag.outputs.is_current == 'true'
+        (
+          needs.validate-nightly-tag.outputs.is_current == 'true'
+          && github.repository == 'AztecProtocol/aztec-packages-private'
+          && startsWith(github.ref_name, 'v5.')
+        )
         || contains(github.event.pull_request.labels.*.name, 'ci-network-scenario')
       )
     steps: