Skip to content

ci: fix main push workflow validation #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicondoa merged 2 commits into from
Aug 22, 2026
Merged

ci: fix main push workflow validation #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
509fdeb
ci: fix main push workflow validation
vicondoa Aug 22, 2026
2d4c445
ci: resolve reusable workflow ref
vicondoa Aug 22, 2026
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
9 changes: 3 additions & 6 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,9 @@ jobs:
fail "branch metadata is not an approved ref"

if [ "$D2B_EVENT_NAME" = "pull_request_target" ]; then
[ "$D2B_CALLER_WORKFLOW_REF" =
"vicondoa/d2b/.github/workflows/pr.yml@refs/heads/main" ] ||
[ "$D2B_CALLER_WORKFLOW_REF" = "vicondoa/d2b/.github/workflows/pr.yml@refs/heads/main" ] ||
fail "PR workflow controls must be sourced from protected main"
[ "$D2B_JOB_WORKFLOW_REF" =
"vicondoa/d2b/.github/workflows/build.yaml@refs/heads/main" ] ||
[ "$D2B_JOB_WORKFLOW_REF" = "vicondoa/d2b/.github/workflows/build.yaml@refs/heads/main" ] ||
fail "reusable build controls must be sourced from protected main"
case "$D2B_BASE_REF" in
main|v3) ;;
Expand All @@ -110,8 +108,7 @@ jobs:
tested_sha="$D2B_MERGE_SHA"
instance="d2b/pr/$D2B_PR_NUMBER/$D2B_HEAD_SHA/linux-x86_64/rules_rs/worker-v1/minimal/lock-v1"
elif [ "$D2B_EVENT_NAME" = "push" ]; then
[ "$D2B_CALLER_WORKFLOW_REF" =
"vicondoa/d2b/.github/workflows/build.yaml@refs/heads/main" ] ||
[ "$D2B_CALLER_WORKFLOW_REF" = "vicondoa/d2b/.github/workflows/build.yaml@refs/heads/main" ] ||
fail "push workflow controls must be sourced from protected main"
[ "$D2B_REF" = "refs/heads/main" ] ||
fail "trusted build pushes are restricted to main"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ permissions:
jobs:
build:
name: build
uses: vicondoa/d2b/.github/workflows/build.yaml@refs/heads/main
uses: vicondoa/d2b/.github/workflows/build.yaml@main
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ deprecations ship one minor release before removal.
window unlabelled. Adds the `proofs/window-identity-chrome/` proof for the
geometry, parts, contrast, and label logic.

### Fixed

- Fixed trusted `main` push validation and reusable workflow resolution so the
BuildBuddy seed workflow executes its metadata checks instead of failing on
shell test parsing.

## [1.4.1] - 2026-07-12

### Added
Expand Down
3 changes: 2 additions & 1 deletion packages/xtask/tests/policy_ci.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ fn main_controlled_buildbuddy_workflows_preserve_trust_contract() {
"PR workflow must not run untrusted pull_request controls"
);
assert!(
pr.contains("uses: vicondoa/d2b/.github/workflows/build.yaml@refs/heads/main")
pr.contains("uses: vicondoa/d2b/.github/workflows/build.yaml@main")
&& !pr.contains("uses: vicondoa/d2b/.github/workflows/build.yaml@refs/heads/main")
&& !pr.contains("D2B_BUILDBUDDY_API_KEY")
&& !pr.contains("secrets: inherit"),
"PR workflow must call the main-owned reusable build at main without PR secret access"
Expand Down
Loading