Skip to content

(CAT-2665) Roll out safe fork CI integration#643

Merged
david22swan merged 4 commits into
mainfrom
cat-2665-fork-ci-haproxy
Jun 17, 2026
Merged

(CAT-2665) Roll out safe fork CI integration#643
david22swan merged 4 commits into
mainfrom
cat-2665-fork-ci-haproxy

Conversation

@LukasAud

@LukasAud LukasAud commented Jun 17, 2026

Copy link
Copy Markdown

Summary

  • Manually applies fork CI changes to ci.yml (already unmanaged: true): adds pull_request_target trigger, permissions, concurrency group, and fork-guard conditions on the Acceptance job — platform exclusion flags preserved
  • Adds fork_ci_label_guard.yml via pdk update (template 19976cd6420755)
  • Routine pdk-template bumps: rubocop plugin updates, Gemfile dependency updates, spec_helper.rb YAML method update, metadata.json pdk-version bump

Test plan

  • CI passes on this PR (non-fork path)
  • Verify fork_ci_label_guard.yml is present in .github/workflows/
  • Verify Acceptance job in ci.yml retains platform exclusion flags

🤖 Generated with Claude Code

Manually apply fork CI changes to ci.yml (already unmanaged): add
pull_request_target trigger, permissions, concurrency group, and
fork-guard conditions on Acceptance, preserving the platform exclusion
flags. Add fork_ci_label_guard.yml via pdk update (template
19976cd → 6420755). Routine pdk-template bumps: rubocop plugin
updates, Gemfile dependency updates, spec_helper YAML method update.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
@LukasAud LukasAud requested review from a team and bastelfreak as code owners June 17, 2026 07:48
LukasAud and others added 3 commits June 17, 2026 08:52
rubocop-rspec 3.x renamed RSpec/FilePath to RSpec/SpecFilePathFormat;
update the inline disable comment to match the new cop name.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
concat 10.0.0 has been released; extend the version requirement to
allow it.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
puppetlabs-haproxy is a fork of glarizza/puppet-haproxy, so
head.repo.fork is always true regardless of whether a PR comes from
a branch on this repo or an external contributor's fork.

Replace fork==false/true checks with head.repo.full_name comparisons
against github.repository, which correctly distinguishes same-repo PRs
from external-fork PRs in both cases.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
@david22swan david22swan merged commit 0948226 into main Jun 17, 2026
20 of 21 checks passed
@david22swan david22swan deleted the cat-2665-fork-ci-haproxy branch June 17, 2026 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants