workflows: fix allowlist update race (#866)#876
Open
potiuk wants to merge 1 commit into
Open
Conversation
The two workflows ran in separate concurrency groups and could overlap on a push that changed both actions.yml and the dependabot composite action.yml, silently clobbering one direction's edit. The new update_allowlist.yml runs both directions in order with a single concurrency group, so neither edit is lost. Fixes #866 Generated-by: Claude Opus 4.7 (1M context)
3 tasks
ppkarwasz
reviewed
May 23, 2026
Comment on lines
+58
to
+61
| - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 | ||
| with: | ||
| persist-credentials: true | ||
| token: ${{ secrets.ALLOWLIST_WORKFLOW_TOKEN || github.token }} # zizmor: ignore[secrets-outside-env] |
Member
There was a problem hiding this comment.
What is the purpose of the PAT here? Recursive behavior?
This workflow modifies the same file (actions.yml) that was used to trigger it. Are we sure the modifications are eventually idempotent?
We should probably add a comment here.
| - name: Commit and push changes | ||
| if: ${{ github.event_name != 'pull_request' }} | ||
| env: | ||
| GH_TOKEN: ${{ secrets.ALLOWLIST_WORKFLOW_TOKEN || github.token }} # zizmor: ignore[secrets-outside-env] |
Member
There was a problem hiding this comment.
What is the purpose of this PAT?
git has already been configured with the recursive token above.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Consolidates
update_actions.yml(composite → actions.yml) andupdate_composite_action.yml(actions.yml → composite) into a singleupdate_allowlist.yml. The previous pair ran in separate concurrencygroups and could overlap, silently clobbering one direction's edit —
see #866 for raboof's reconstruction of how a dependabot bump got
downgraded.
The combined workflow:
mainwhen either file changesthen regenerate composite + approved_patterns.yml from actions.yml
mainHEAD (not the trigger SHA) so a queued runsees the prior run's commit
Also updates the README's three mermaid diagrams + prose to point at the
new workflow name. The two
utils/check_cache_settings/*.pychanges areprekauto-inserting missing Apache license headers on pre-existingfiles — unrelated to #866 but caught by
prek run --all-files; CI wouldhave auto-fixed them anyway.
Fixes #866
Test plan
uv run pytest gateway/— 8 passedprek run --all-filescleanworkflow_dispatchon an unchanged treeto confirm no-op behavior
actions.yml+composite +
approved_patterns.ymlall update from a single workflow