Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
add-to-project:
permissions:
contents: read
uses: petry-projects/.github/.github/workflows/add-to-project-reusable.yml@add-to-project/stable # NOSONAR(githubactions:S7637) first-party channel ref
uses: petry-projects/.github/.github/workflows/add-to-project-reusable.yml@add-to-project/v1-stable # NOSONAR(githubactions:S7637) first-party channel ref
with:
project_id: PVT_kwDOD2inqs4BZq3-
project_url: https://github.com/orgs/petry-projects/projects/1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/agent-shield.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ permissions:

jobs:
agent-shield:
uses: petry-projects/.github/.github/workflows/agent-shield-reusable.yml@agent-shield/next
uses: petry-projects/.github/.github/workflows/agent-shield-reusable.yml@agent-shield/v2-next
with:
required-files: AGENTS.md
2 changes: 1 addition & 1 deletion .github/workflows/auto-rebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ jobs:
permissions:
contents: write # update-branch via GITHUB_TOKEN (may touch .github/workflows/)
pull-requests: write # post comments on PRs
uses: petry-projects/.github/.github/workflows/auto-rebase-reusable.yml@auto-rebase/next
uses: petry-projects/.github/.github/workflows/auto-rebase-reusable.yml@auto-rebase/v2-next
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ jobs:
permissions:
contents: read
pull-requests: read
uses: petry-projects/.github/.github/workflows/dependabot-automerge-reusable.yml@dependabot-automerge/next
uses: petry-projects/.github/.github/workflows/dependabot-automerge-reusable.yml@dependabot-automerge/v2-next
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/dependency-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ permissions:

jobs:
dependency-audit:
uses: petry-projects/.github/.github/workflows/dependency-audit-reusable.yml@dependency-audit/next
uses: petry-projects/.github/.github/workflows/dependency-audit-reusable.yml@dependency-audit/v2-next
2 changes: 1 addition & 1 deletion .github/workflows/dev-lead.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# Pinning a channel tag (not @main) keeps a broken change on main from gating
# its own fix (the circular dependency). agent_ref pins the dev-lead
# scripts/prompts checkout to the same channel.
uses: petry-projects/.github-private/.github/workflows/dev-lead-reusable.yml@dev-lead/next
uses: petry-projects/.github-private/.github/workflows/dev-lead-reusable.yml@dev-lead/v1-next
with:
agent_ref: dev-lead/next
secrets: inherit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/feature-ideation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ jobs:
# See AGENTS.md "Release channel tags & the mutable-ref exception" and
# docs/release/versioning.md (ring channels; Cross-repo: feature-ideation).
# Precedent: auto-rebase.yml intentionally pins its reusable @v2 ahead of canon.
uses: petry-projects/.github/.github/workflows/feature-ideation-reusable.yml@feature-ideation/next
uses: petry-projects/.github/.github/workflows/feature-ideation-reusable.yml@feature-ideation/v1-next
with:
# All values below come from `needs.prep.outputs.*` (resolved in the `prep`
# job) — NOT the `inputs` context — so this reusable `with:` compiles on the
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-review-mention.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
pr-review-mention:
permissions:
pull-requests: write
uses: petry-projects/.github/.github/workflows/pr-review-mention-reusable.yml@pr-review-mention/next
uses: petry-projects/.github/.github/workflows/pr-review-mention-reusable.yml@pr-review-mention/v2-next
secrets:
GH_PAT_WORKFLOWS: ${{ secrets.GH_PAT_WORKFLOWS }}
DON_PETRY_BOT_GH_PAT: ${{ secrets.DON_PETRY_BOT_GH_PAT }}
13 changes: 6 additions & 7 deletions tests/dev-lead/integration/test_auto_rebase_stub.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#!/usr/bin/env python3
"""Validate that auto-rebase.yml uses the @auto-rebase/next channel tag, not a SHA or frozen @vX.
"""Validate that auto-rebase.yml uses the @auto-rebase/v2-next channel tag, not a SHA or frozen @vX.

AGENTS.md §"Release channel tags & the mutable-ref exception" exempts first-party
reusable workflows from the SHA-pin standard. This repo (.github-private) is the
`next` ring tier (epic #495), so the correct reference for the auto-rebase
reusable is the moving channel tag `@auto-rebase/next` (#870), matching the
canonical stub at standards/workflows/auto-rebase.yml in petry-projects/.github.
reusable workflows from the SHA-pin standard. This repo (.github-private) is pinned
to the @auto-rebase/v2-next channel (major-scope repin #657), which is the current
moving channel for this ring ahead of the canonical @auto-rebase/next standard.

Regression guard: a SHA-pinned or frozen-tag reference is a compliance violation (issue #139).
"""
Expand All @@ -21,7 +20,7 @@

WORKFLOW = ".github/workflows/auto-rebase.yml"
REUSABLE = "petry-projects/.github/.github/workflows/auto-rebase-reusable.yml"
EXPECTED_REF = "@auto-rebase/next"
EXPECTED_REF = "@auto-rebase/v2-next"
SHA_PATTERN = re.compile(r"@[0-9a-f]{40}\b")


Expand Down Expand Up @@ -64,7 +63,7 @@ def main() -> int:
failures.append(
f" SHA-pinned: {ref!r}\n"
f" Expected: '{REUSABLE}{EXPECTED_REF}'\n"
" Reason: first-party reusable workflows must use the @auto-rebase/stable\n"
" Reason: first-party reusable workflows must use the @auto-rebase/v2-next\n"
" channel tag, not a SHA (AGENTS.md §Release channel tags)."
)
elif not ref.endswith(EXPECTED_REF):
Expand Down
7 changes: 4 additions & 3 deletions tests/dev-lead/integration/test_dependency_audit_stub.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/usr/bin/env python3
"""Validate that dependency-audit.yml is the canonical org stub pinned to @dependency-audit/next.
"""Validate that dependency-audit.yml is the canonical org stub pinned to @dependency-audit/v2-next.

The org standard requires dependency-audit.yml to be a thin caller stub that
delegates to the reusable at @dependency-audit/next (not a SHA or any other ref).
delegates to the reusable at @dependency-audit/v2-next (major-scope repin #657;
this repo is pinned to the v2 channel ahead of the canonical @dependency-audit/next).

Standard: petry-projects/.github/standards/ci-standards.md#centralization-tiers
Source of truth: petry-projects/.github/standards/workflows/dependency-audit.yml
Expand All @@ -18,7 +19,7 @@
sys.exit(2)

WORKFLOW = ".github/workflows/dependency-audit.yml"
EXPECTED_USES = "petry-projects/.github/.github/workflows/dependency-audit-reusable.yml@dependency-audit/next"
EXPECTED_USES = "petry-projects/.github/.github/workflows/dependency-audit-reusable.yml@dependency-audit/v2-next"


def main() -> int:
Expand Down
7 changes: 3 additions & 4 deletions tests/test_dependabot.bats
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@

DEPENDABOT_YML=".github/dependabot.yml"
AUTOMERGE_YML=".github/workflows/dependabot-automerge.yml"
# This repo (.github-private) is the `next` ring tier (epic #495), so its stub
# pins the dependabot-automerge/next channel rather than the former @v1 SHA
# (#870). The org compliance audit is ring-aware (petry-projects/.github#529).
AUTOMERGE_CHANNEL="dependabot-automerge/next"
# This repo (.github-private) pins the v2-next ring channel (major-scope repin #657).
# The org compliance audit is ring-aware (petry-projects/.github#529).
AUTOMERGE_CHANNEL="dependabot-automerge/v2-next"

setup() {
# Run tests from repo root so relative paths resolve correctly.
Expand Down
4 changes: 2 additions & 2 deletions tests/test_feature_ideation.bats
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ FEATURE_IDEATION_YML=".github/workflows/feature-ideation.yml"
# Canonical reusable + channel pin from
# petry-projects/.github/standards/workflows/feature-ideation.yml
REUSABLE="petry-projects/.github/.github/workflows/feature-ideation-reusable.yml"
# The candidate (folded-enhancement) ring channel this repo (next/dogfood) pins to.
CHANNEL="feature-ideation/next"
# This repo pins the v1-next ring channel (major-scope repin #657).
CHANNEL="feature-ideation/v1-next"

setup() {
# Run tests from repo root so relative paths resolve correctly.
Expand Down
Loading