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 actions/checkout from 4.1.7 to 4.2.0 #9286

Merged
merged 1 commit into from
Oct 1, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 1, 2024

Bumps actions/checkout from 4.1.7 to 4.2.0.

Release notes

Sourced from actions/checkout's releases.

v4.2.0

What's Changed

New Contributors

Full Changelog: actions/checkout@v4.1.7...v4.2.0

Changelog

Sourced from actions/checkout's changelog.

Changelog

v4.2.0

v4.1.7

v4.1.6

v4.1.5

v4.1.4

v4.1.3

v4.1.2

v4.1.1

v4.1.0

v4.0.0

v3.6.0

... (truncated)

Commits

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 [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@692973e...d632683)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added backport release_3.34 On merge create a backported pull request to 3.34 dependencies Pull requests that update a dependency file labels Oct 1, 2024
@DelazJ DelazJ merged commit 1a422d6 into master Oct 1, 2024
7 of 8 checks passed
@dependabot dependabot bot deleted the dependabot/github_actions/actions/checkout-4.2.0 branch October 1, 2024 12:09
@qgis-bot
Copy link
Collaborator

qgis-bot commented Oct 1, 2024

The backport to release_3.34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c51b8b7c03... Bump actions/checkout from 4.1.7 to 4.2.0
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging .github/workflows/builds.yml
CONFLICT (content): Merge conflict in .github/workflows/builds.yml
Auto-merging .github/workflows/doctest.yml
CONFLICT (content): Merge conflict in .github/workflows/doctest.yml
Auto-merging .github/workflows/pofiles.yml
CONFLICT (content): Merge conflict in .github/workflows/pofiles.yml
Auto-merging .github/workflows/pull_minimized_translations.yml
CONFLICT (content): Merge conflict in .github/workflows/pull_minimized_translations.yml
Auto-merging .github/workflows/translation_statistics.yml
CONFLICT (content): Merge conflict in .github/workflows/translation_statistics.yml

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.34 release_3.34
# Navigate to the new working tree
cd .worktrees/backport-release_3.34
# Create a new branch
git switch --create backport-9286-to-release_3.34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c51b8b7c0319792ffe0ed38ac6821ad1c5584bbc
# Push it to GitHub
git push --set-upstream origin backport-9286-to-release_3.34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3.34

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

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

Successfully merging this pull request may close these issues.

2 participants