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

dependabot: Ignore major PatternFly and sass updates, teach dependabot workflow to rebase #1895

Merged
merged 2 commits into from
Oct 28, 2024

Conversation

martinpitt
Copy link
Member

No description provided.

martinpitt and others added 2 commits October 27, 2024 21:20
Our dependabot workflow is unable to deal with conflicting node_modules
when we land one of the dependabot pull requests. The manual workflow
before was to let dependabot re-create the pull request and then add the
`node_modules` label after re-recreating the pull request. Automating
this is tricky as a Github workflow cannot automate the recreate comment
as it has no write permissions to our projects.

The new approach when adding a `node_modules` label will always rebase
the pull request and in case of a conflict will remove the conflicting
node_modules changes in the commit. Afterwards we create the new
node_modules commit which can be merged.
@martinpitt martinpitt added the .github-changes Set by a reviewer just before landing to acknowledge that a PR changes github workflows label Oct 27, 2024
@martinpitt martinpitt requested a review from jelly October 27, 2024 20:22
@jelly jelly merged commit 14e7c04 into cockpit-project:main Oct 28, 2024
34 of 35 checks passed
@martinpitt martinpitt deleted the pf-ignore branch October 28, 2024 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
.github-changes Set by a reviewer just before landing to acknowledge that a PR changes github workflows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants