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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ updates:
patterns:
- "@xterm/*"

ignore:
# https://github.com/cockpit-project/cockpit/issues/21151
- dependency-name: "sass"
versions: ["1.80.x", "2.x"]

# needs to be done in Cockpit first
- dependency-name: "@patternfly/*"
update-types: ["version-update:semver-major"]

- package-ecosystem: "github-actions"
directory: "/"
open-pull-requests-limit: 3
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@ jobs:
}
}

- name: Rebase pull request and drop node_modules changes
run: |
set -x
git config --global user.name "GitHub Workflow"
git config --global user.email "[email protected]"
git fetch origin main:main
if ! git rebase main; then
git reset node_modules
GIT_EDITOR=true git rebase --continue
git show --stat
fi

- name: Update node_modules for package.json changes
run: |
make tools/node-modules
Expand Down
Loading