Skip to content

ci: drop bypass_actors from .asf.yaml ruleset#5047

Merged
Yicong-Huang merged 1 commit into
apache:mainfrom
aglinxinyuan:fix-asf-yaml-rulesets
May 13, 2026
Merged

ci: drop bypass_actors from .asf.yaml ruleset#5047
Yicong-Huang merged 1 commit into
apache:mainfrom
aglinxinyuan:fix-asf-yaml-rulesets

Conversation

@aglinxinyuan
Copy link
Copy Markdown
Contributor

@aglinxinyuan aglinxinyuan commented May 13, 2026

What changes were proposed in this PR?

Remove the bypass_actors: block from the Merge Queue ruleset added in #5036. ASF Infra flagged that block specifically with Invalid property /bypass_actors/0/actor_id: "4" is not of type integer, and removing it is the minimal change that addresses that error.

Background

Since #5036 merged, every push to main triggers this email from ASF Infra:

Validation failed while creating ruleset 'Merge Queue': Invalid request.

Invalid property /bypass_actors/0/actor_id: `"4"` is not of type `integer`.
Invalid property /rules/2: data matches no possible input.
Invalid property /rules/3: data matches no possible input.
Invalid property /rules/5: data matches no possible input.

This PR addresses the first line (bypass_actors/0/actor_id). ASF Infra's follow-up reply did not include a bypass_actors block in the recommended example, so removing it aligns with their suggestion.

How was this PR tested?

Verified .asf.yaml still parses through strictyaml and that the only change is the four removed bypass_actors lines:

git diff -- .asf.yaml
ruby -e 'require "yaml"; YAML.load_file(".asf.yaml"); puts "ok"'

No automated runtime tests added — this PR only changes repository configuration.

Any related issues, documentation, discussions?

Follow-up to #5036.

Was this PR authored or co-authored using generative AI tooling?

Generated-by: Claude Code (Opus 4.7)

Copilot AI review requested due to automatic review settings May 13, 2026 05:47
@github-actions github-actions Bot added fix ci changes related to CI labels May 13, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Fixes ASF Infra validation errors caused by #5036's raw-payload ruleset by switching .asf.yaml to asfyaml's convenience syntax, which properly coerces strictyaml-stringified scalars to the int/bool types GitHub's Rulesets API requires.

Changes:

  • Replace the raw-payload Merge Queue ruleset with a convenience-syntax Main branch protection ruleset.
  • Preserve review/conversation/linear-history/required-checks protections; drop merge_queue rule and bypass_actors (not supported in convenience syntax).
  • Add an explanatory comment about the strictyaml stringification issue.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented May 13, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 42.81%. Comparing base (4f56946) to head (8b0f206).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #5047   +/-   ##
=========================================
  Coverage     42.81%   42.81%           
- Complexity     2208     2209    +1     
=========================================
  Files          1045     1045           
  Lines         40119    40119           
  Branches       4239     4239           
=========================================
+ Hits          17177    17178    +1     
+ Misses        21876    21874    -2     
- Partials       1066     1067    +1     
Flag Coverage Δ
access-control-service 39.53% <ø> (ø)
agent-service 33.72% <ø> (ø)
amber 43.70% <ø> (+<0.01%) ⬆️
computing-unit-managing-service 0.00% <ø> (ø)
config-service 0.00% <ø> (ø)
file-service 32.18% <ø> (ø)
frontend 33.93% <ø> (ø)
python 88.92% <ø> (ø)
workflow-compiling-service 47.72% <ø> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@Yicong-Huang Yicong-Huang changed the title ci: fix .asf.yaml ruleset validation errors from #5036 ci: fix .asf.yaml ruleset validation errors May 13, 2026
@aglinxinyuan aglinxinyuan reopened this May 13, 2026
Remove the bypass_actors block in .asf.yaml that ASF Infra flagged with
`Invalid property /bypass_actors/0/actor_id: "4" is not of type integer`.
The remaining `/rules/N` validation errors are tracked separately - they
appear to stem from asfyaml passing strictyaml-stringified scalars straight
to GitHub's Rulesets API when using raw-payload rulesets.
@aglinxinyuan aglinxinyuan force-pushed the fix-asf-yaml-rulesets branch from f9d668c to 8b0f206 Compare May 13, 2026 06:02
@aglinxinyuan aglinxinyuan changed the title ci: fix .asf.yaml ruleset validation errors ci: drop bypass_actors from .asf.yaml ruleset May 13, 2026
@aglinxinyuan aglinxinyuan requested a review from Yicong-Huang May 13, 2026 06:04
Copy link
Copy Markdown
Contributor

@Yicong-Huang Yicong-Huang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's try this out. if not working, we can revert #5036

@Yicong-Huang Yicong-Huang enabled auto-merge (squash) May 13, 2026 06:08
@Yicong-Huang Yicong-Huang merged commit 777db47 into apache:main May 13, 2026
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci changes related to CI fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants