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 fsfe/reuse-action from 3 to 4 #923

Merged
merged 1 commit into from
Jul 8, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jul 8, 2024

Bumps fsfe/reuse-action from 3 to 4.

Release notes

Sourced from fsfe/reuse-action's releases.

v4.0.0

Changes

  • Bumped to v4 of reuse-tool in #32.
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 [fsfe/reuse-action](https://github.com/fsfe/reuse-action) from 3 to 4.
- [Release notes](https://github.com/fsfe/reuse-action/releases)
- [Commits](fsfe/reuse-action@v3...v4)

---
updated-dependencies:
- dependency-name: fsfe/reuse-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Jul 8, 2024
@felixfontein felixfontein merged commit 4277b60 into main Jul 8, 2024
127 checks passed
@felixfontein felixfontein deleted the dependabot/github_actions/fsfe/reuse-action-4 branch July 8, 2024 05:51
@felixfontein felixfontein added the backport-2 Automatically create a backport for the stable-2 branch label Jul 8, 2024
Copy link

patchback bot commented Jul 8, 2024

Backport to stable-2: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 4277b60 on top of patchback/backports/stable-2/4277b60340ce6f8224b6d82ebf23eb38742b04b8/pr-923

Backporting merged PR #923 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.docker.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-2/4277b60340ce6f8224b6d82ebf23eb38742b04b8/pr-923 upstream/stable-2
  4. Now, cherry-pick PR Bump fsfe/reuse-action from 3 to 4 #923 contents into that branch:
    $ git cherry-pick -x 4277b60340ce6f8224b6d82ebf23eb38742b04b8
    If it'll yell at you with something like fatal: Commit 4277b60340ce6f8224b6d82ebf23eb38742b04b8 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 4277b60340ce6f8224b6d82ebf23eb38742b04b8
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Bump fsfe/reuse-action from 3 to 4 #923 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2/4277b60340ce6f8224b6d82ebf23eb38742b04b8/pr-923
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2 Automatically create a backport for the stable-2 branch dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant