Skip to content
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.

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

Do not allow bot to overwrite someone else changes #896

Closed
Ana06 opened this issue Feb 9, 2024 · 6 comments · Fixed by #1158
Closed

Do not allow bot to overwrite someone else changes #896

Ana06 opened this issue Feb 9, 2024 · 6 comments · Fixed by #1158
Assignees
Labels
💎 enhancement It is working, but it could be better 🏃 CI Related to CI

Comments

@Ana06
Copy link
Member

Ana06 commented Feb 9, 2024

Details

We should add a --force-with-lease to our bot to avoid that it overwrites someone else changes when updating packages like in #864 (comment)

@Ana06 Ana06 added 💎 enhancement It is working, but it could be better 🏃 CI Related to CI labels Feb 9, 2024
@Ana06 Ana06 self-assigned this Feb 9, 2024
@mr-tz
Copy link
Contributor

mr-tz commented Feb 14, 2024

or we can create unique branches including the date here:

branch: package-update

@Ana06
Copy link
Member Author

Ana06 commented Feb 19, 2024

@mr-tz

or we can create unique branches including the date here:

This will create several updates PRs, which I don't think it is desirable. The bot at the moment overwrites its own changes adding more updates and removing broken owns if the PR is not merged within a week or if triggered manually. I think this is a nice feature we want to keep. If we modified manually the PR, it is because there is an issue, so we don't want the bot to send another broken PR.

@Ana06
Copy link
Member Author

Ana06 commented Feb 19, 2024

I think we should ensure that the bot pushes using --force-with-lease. Not sure if this a bug or a feature request in https://github.com/peter-evans/create-pull-request

@Ana06
Copy link
Member Author

Ana06 commented Feb 19, 2024

I have open an issue at peter-evans/create-pull-request#2766

@Ana06
Copy link
Member Author

Ana06 commented Feb 19, 2024

The bot is already using --force-with-lease (see peter-evans/create-pull-request#2766). I think we should close this issue, as we would have to lose some nice feature to ensure the bot does not change the PR. I think it is not worthwhile, as this has only happened once and we can ensure we merge quick when manually modifying bot PR or push the changes to a new PR.

@Ana06 Ana06 closed this as completed Feb 19, 2024
@Ana06
Copy link
Member Author

Ana06 commented Nov 6, 2024

We could at least improve the comment in the PR to help people reviewing the changes that may not be familiar with the automation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💎 enhancement It is working, but it could be better 🏃 CI Related to CI
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants