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

Bump peter-evans/create-pull-request from 7.0.6 to 7.0.7 #9689

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 1, 2025

Bumps peter-evans/create-pull-request from 7.0.6 to 7.0.7.

Release notes

Sourced from peter-evans/create-pull-request's releases.

Create Pull Request v7.0.7

⚙️ Fixes an issue with commit signing where modifications to the same file in multiple commits squash into the first commit.

What's Changed

New Contributors

Full Changelog: peter-evans/create-pull-request@v7.0.6...v7.0.7

Commits
  • dd2324f fix: use showFileAtRefBase64 to read per-commit file contents (#3744)
  • 367180c ci: remove testv5 cmd
  • 25575a1 build: update distribution (#3736)
  • a56e7a5 build(deps): bump @​octokit/core from 6.1.3 to 6.1.4 (#3711)
  • eac17dc build(deps-dev): bump @​types/node from 18.19.75 to 18.19.76 (#3712)
  • a2e685f build(deps): bump @​octokit/plugin-paginate-rest from 11.4.1 to 11.4.2 (#3713)
  • 6cfd146 build(deps-dev): bump eslint-import-resolver-typescript (#3710)
  • b38e8d3 build(deps-dev): bump prettier from 3.5.0 to 3.5.1 (#3709)
  • 8a41570 build: update distribution (#3691)
  • 2e9b4cc build(deps): bump @​octokit/endpoint from 10.1.2 to 10.1.3 (#3700)
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 7.0.6 to 7.0.7.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@67ccf78...dd2324f)

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

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added backport release_3.40 On merge create a backported pull request to 3.40 dependencies Pull requests that update a dependency file labels Mar 1, 2025
@DelazJ DelazJ merged commit d0edb83 into master Mar 3, 2025
8 checks passed
@DelazJ DelazJ deleted the dependabot/github_actions/peter-evans/create-pull-request-7.0.7 branch March 3, 2025 11:19
@qgis-bot
Copy link
Collaborator

qgis-bot commented Mar 3, 2025

The backport to release_3.40 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
To https://github.com/qgis/QGIS-Documentation.git
 ! [remote rejected]       backport-9689-to-release_3.40 -> backport-9689-to-release_3.40 (refusing to allow a Personal Access Token to create or update workflow `.github/workflows/translation_statistics.yml` without `workflow` scope)
error: failed to push some refs to 'https://github.com/qgis/QGIS-Documentation.git'

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3.40 release_3.40
# Navigate to the new working tree
cd .worktrees/backport-release_3.40
# Create a new branch
git switch --create backport-9689-to-release_3.40
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 77e58553dc834716a6b5f1d4e70ccdd2e85cd39c
# Push it to GitHub
git push --set-upstream origin backport-9689-to-release_3.40
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3.40

Then, create a pull request where the base branch is release_3.40 and the compare/head branch is backport-9689-to-release_3.40.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3.40 On merge create a backported pull request to 3.40 dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants