Skip to content

Conversation

@jrfnl
Copy link
Member

@jrfnl jrfnl commented Dec 12, 2025

Detailed Description

The only thing new here is the changelog commit, everything else is cherrypicked from previously approved PRs.

Closes #989

dependabot bot and others added 9 commits December 12, 2025 18:20
Bumps the action-runners group with 1 update: [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request).


Updates `peter-evans/create-pull-request` from 7.0.8 to 7.0.9
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@271a8d0...84ae59a)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-version: 7.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: action-runners
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [actions/checkout](https://github.com/actions/checkout) from 5.0.1 to 6.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@93cb6ef...1af3b93)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps the action-runners group with 2 updates: [shivammathur/setup-php](https://github.com/shivammathur/setup-php) and [actions/setup-python](https://github.com/actions/setup-python).


Updates `shivammathur/setup-php` from 2.35.5 to 2.36.0
- [Release notes](https://github.com/shivammathur/setup-php/releases)
- [Commits](shivammathur/setup-php@bf6b4fb...44454db)

Updates `actions/setup-python` from 6.0.0 to 6.1.0
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@e797f83...83679a8)

---
updated-dependencies:
- dependency-name: shivammathur/setup-php
  dependency-version: 2.36.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: action-runners
- dependency-name: actions/setup-python
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: action-runners
...

Signed-off-by: dependabot[bot] <[email protected]>
Currently, the `update-website` workflow doesn't deploy the website straight away. Instead it opens a PR with the files which will be changed to allow for review of the website changes before deploying the updated website (by merging the PR).

To that end, the workflow is run:
* Whenever a tag is created.
* When a pull request changes any of the files directly involved in updating the website.
* When manually requested.

What with the frequent Dependabot updates, this has become quite noisy for the "pull request which changes the workflow" trigger.

To that end, this commit blocks the opening of the PR when the workflow/doc building files are changed, while still running the rest of the workflow to verify that the workflow wasn't broken by the changes.

It also introduces a new step to create the branch holding the changes in the local environment.
This was previously done via the "create PR" step, which will now be skipped, while we still need the branch for verifying Ruby can build the GH Pages site.

As the branch should now be checked-out already before we even get to the part of the workflow verifying the site can be build via GH Pages, we can also remove the separate `actions/checkout` step.
This commit adds a new workflow which automatically checks for merge conflicts in open PRs.

The selected action runner also has an option to post a comment when a conflict is detected as well as when the conflict has been resolved. While not currently used, this feature might be useful in the future.

Refs:
* https://github.com/eps1lon/actions-label-merge-conflict
@jrfnl jrfnl added this to the 2.0.17 milestone Dec 12, 2025
jrfnl and others added 2 commits December 12, 2025 18:41
Related to 988 and the release of PHPCompatibility 10.0.0-alpha2.
@jrfnl jrfnl merged commit 64800ca into stable Dec 12, 2025
34 checks passed
@jrfnl jrfnl deleted the release/2.0.17 branch December 12, 2025 17:44
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.

3 participants