Skip to content

Conversation

@jrfnl
Copy link
Member

@jrfnl jrfnl commented Sep 15, 2025

Description

PHPCS has renamed the master branch to 3.x.

This commit account for that.

  • Change dev-master to 3.x-dev in workflows.
  • Update links referencing the upstream code to use HEAD instead of the branch name.

Suggested changelog entry

N/A

@jrfnl
Copy link
Member Author

jrfnl commented Sep 15, 2025

N.B.: the branch protection will need an update to be able to merge this PR.

Looks like we don't actually need to update branch protection for this PR.

@jrfnl jrfnl modified the milestones: 3.2.x, 3.3.0 Sep 16, 2025
PHPCS has renamed the `master` branch to `3.x`.

This commit account for that.

* Change `dev-master` to `3.x-dev` in workflows.
* Update links referencing the upstream code to use `HEAD` instead of the branch name.
@jrfnl jrfnl force-pushed the feature/ghactions-upstream-branch-rename branch from fbac61f to a09a269 Compare September 16, 2025 17:45
@jrfnl
Copy link
Member Author

jrfnl commented Sep 16, 2025

Rebased without changes to get a passing build after the merge of #2606

@jrfnl jrfnl requested a review from GaryJones September 17, 2025 12:54
Copy link
Member

@GaryJones GaryJones left a comment

Choose a reason for hiding this comment

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

"In the case of a branch with a version-like name (v1, in this case), you append -dev as a suffix, rather than using dev- as a prefix."
https://getcomposer.org/doc/articles/versions.md#branches

i.e. to tell Composer to require the head of a branch that looks like a tag, and not a specific tag, then add the -dev suffix. TIL.

@GaryJones GaryJones merged commit 93c8284 into develop Sep 17, 2025
40 checks passed
@GaryJones GaryJones deleted the feature/ghactions-upstream-branch-rename branch September 17, 2025 13:35
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.

5 participants