Skip to content

ci(rector-apply): Ignore composer changes#58800

Merged
provokateurin merged 1 commit intomasterfrom
ci/rector-apply/ignore-composer-changes
Mar 9, 2026
Merged

ci(rector-apply): Ignore composer changes#58800
provokateurin merged 1 commit intomasterfrom
ci/rector-apply/ignore-composer-changes

Conversation

@provokateurin
Copy link
Member

Fixes #58788

Signed-off-by: provokateurin <kate@provokateurin.de>
@provokateurin provokateurin added this to the Nextcloud 34 milestone Mar 9, 2026
@provokateurin provokateurin requested a review from a team as a code owner March 9, 2026 10:29
@provokateurin provokateurin added bug 3. to review Waiting for reviews labels Mar 9, 2026
@provokateurin provokateurin requested review from nfebe and sorbaugh and removed request for a team March 9, 2026 10:29
@provokateurin provokateurin enabled auto-merge March 9, 2026 10:30
@susnux susnux requested a review from Copilot March 9, 2026 10:30
Copy link

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

This PR fixes the rector-apply CI workflow to prevent spurious composer-generated file changes from being committed alongside actual rector refactoring changes. When composer remove nextcloud/ocp --dev --no-scripts and composer i are run to prepare the environment, they modify files in lib/composer/composer/. The added git restore call discards those changes before rector runs and before create-pull-request collects the diff, ensuring the automated rector PR only contains real refactoring changes.

Changes:

  • Added git restore lib/composer/composer after the composer install step to discard unintended file changes generated by the composer operations

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

Copy link
Contributor

@susnux susnux left a comment

Choose a reason for hiding this comment

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

copilot convinced me 🤪

@provokateurin provokateurin merged commit 938b9ba into master Mar 9, 2026
213 of 219 checks passed
@provokateurin provokateurin deleted the ci/rector-apply/ignore-composer-changes branch March 9, 2026 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews bug CI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants