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 stefanzweifel/git-auto-commit-action from 5.0.1 to 5.1.0 #9601

Conversation

dependabot[bot]
Copy link
Contributor

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

Bumps stefanzweifel/git-auto-commit-action from 5.0.1 to 5.1.0.

Release notes

Sourced from stefanzweifel/git-auto-commit-action's releases.

v5.1.0

Changed

Fixed

Dependency Updates

Changelog

Sourced from stefanzweifel/git-auto-commit-action's changelog.

Changelog

All notable changes to this project will be documented in this file.

The format is based on Keep a Changelog and this project adheres to Semantic Versioning.

Unreleased

TBD

v5.1.0 - 2025-01-11

Changed

Fixed

Dependency Updates

v5.0.1 - 2024-04-12

Fixed

  • Fail if attempting to execute git commands in a directory that is not a git-repo. (#326) @​ccomendant

Dependency Updates

Misc

v5.0.0 - 2023-10-06

New major release that bumps the default runtime to Node 20. There are no other breaking changes.

Changed

... (truncated)

Commits
  • e348103 Merge pull request #354 from parkerbxyz/patch-1
  • 032ffbe Include github.actor_id in default commit_author
  • 0b492c0 Bump bats from 1.11.0 to 1.11.1 (#353)
  • 050015d Add Scope/Permissions documentation for PATs
  • 573710f docs(README): fix broken protected branch docs link (#346)
  • e961da7 Update README.md (#343)
  • ac88237 Bump github/super-linter from 6 to 7 (#342)
  • be823a7 Bump github/super-linter from 5 to 6 (#335)
  • 55a82ca Add Section on preventing infinite loops to README
  • 18157e6 Update bug.yaml
  • 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 [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 5.0.1 to 5.1.0.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](stefanzweifel/git-auto-commit-action@8621497...e348103)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@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 Feb 1, 2025
@DelazJ DelazJ merged commit 19cee35 into master Feb 1, 2025
7 of 8 checks passed
@DelazJ DelazJ deleted the dependabot/github_actions/stefanzweifel/git-auto-commit-action-5.1.0 branch February 1, 2025 11:52
@qgis-bot
Copy link
Collaborator

qgis-bot commented Feb 1, 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-9601-to-release_3.40 -> backport-9601-to-release_3.40 (refusing to allow a Personal Access Token to create or update workflow `.github/workflows/pofiles.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-9601-to-release_3.40
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 9a3652d4fd88a188dc55bfb4a0991b6c5c0800f9
# Push it to GitHub
git push --set-upstream origin backport-9601-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-9601-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