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 the ci group across 1 directory with 5 updates #1004

Merged
merged 2 commits into from
Jun 11, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 11, 2024

Bumps the ci group with 5 updates in the / directory:

Package From To
korthout/backport-action 2.5.0 3.0.2
docker/build-push-action 5.3.0 5.4.0
docker/login-action 3.1.0 3.2.0
goreleaser/goreleaser-action 5.1.0 6.0.0
github/codeql-action 3.25.6 3.25.8

Updates korthout/backport-action from 2.5.0 to 3.0.2

Release notes

Sourced from korthout/backport-action's releases.

Backport-action v3.0.2

Fixed

This release fixes a small bug in the draft_commit_conflicts option for the experimental conflict_resolution feature. When encountering conflicts, the backport pull request is opened in draft mode with the conflicts committed. Instructions are provided to resolve these conflicts locally, but these were incorrect. For more details see korthout/backport-action#421.

Full Changelog: korthout/backport-action@v3.0.1...v3.0.2

Backport-action v3.0.1

Fixed

This release fixes a small bug in the draft_commit_conflicts option for the experimental conflict_resolution feature. When encountering conflicts, the backport pull request is opened in draft mode with the conflicts committed. Instructions are provided to resolve these conflicts locally, but these were incorrect. For more details see #421.

Full Changelog: korthout/backport-action@v3.0.0...v3.0.1

Backport-action v3.0.0

Changed

This release changes the default behavior of the action to determine which commits are cherry-picked. While this behavior change doesn't necessarily require changes to your workflow, it warrants a major version bump.

Previously, the action cherry-picked the commits from the pull request. Specifically, those reachable from the pull request's head and not reachable from the pull request's base.

From now on, the action cherry-picks the commits based on the method used to merge the pull request by default.

  • For "Squash and merge", the action cherry-picks the squashed commit.
  • For "Rebase and merge", the action cherry-picks the rebased commits.
  • For "Merged as a merge commit", the action cherry-picks the commits from the pull request.

If you previously used the experimental detect_merge_method input, we suggest you remove it from your workflow. This experimental input has been deprecated and replaced by the cherry_picking input.

If you want to return to the previous behavior, you can set the cherry_picking input to pull_request_head.

This behavior was previously available via the experimental detect_merge_method input, introduced in korthout/backport-action#399. Special thanks go out to @​jschmid1 for contributing this feature.

Added

This release also adds two new experimental features. Special shoutouts to @​tasso94 and @​vermz99 for contributing these!

With the experimental downstream_repo and downstream_owner inputs, you can backport to a repository other than where the workflow runs. For example, when you use a fork to maintain the previously released versions. You can also see this as backporting to a remote repository, but we felt it was better described as backporting to a downstream repository. The default behavior remains that the action always backports to the repository in which the workflow runs.

With the experimental conflict_resolution input, you can now change how the action will handle conflicts during cherry-picking. Set it to draft_commit_conflicts to create a draft pull request with the first conflict encountered committed to reduce some of the manual efforts in backporting. The default behavior stays like before and can be configured explicitly as fail. In that case, the backport fails when the cherry-pick encounters a conflict.

Updated Dependencies

... (truncated)

Commits
  • bd410d3 dist: release 3.0.2
  • 7e34d5f dist: build new artifacts
  • 9237785 Merge pull request #423 from korthout/korthout-fix-draft-checkout
  • 8fef44e fix: checkout branch not target
  • f73aeb9 dist: release 3.1.0-SNAPSHOT
  • ecb5bc3 dist: release 3.0.1
  • c7a7132 dist: build new artifacts
  • da478f7 Merge pull request #422 from korthout/korthout-fix-draft-conflict-suggestions
  • 863937d fix: fetch and checkout draft pr branch directly
  • 7d390fd dist: release 3.1.0-SNAPSHOT
  • Additional commits viewable in compare view

Updates docker/build-push-action from 5.3.0 to 5.4.0

Release notes

Sourced from docker/build-push-action's releases.

v5.4.0

Full Changelog: docker/build-push-action@v5.3.0...v5.4.0

Commits
  • ca052bb Merge pull request #1128 from crazy-max/builder-info
  • 025c205 chore: update generated content
  • 12076d2 show builder information before building
  • ef6cba3 Merge pull request #1127 from docker/dependabot/npm_and_yarn/docker/actions-t...
  • 4c16cf9 chore: update generated content
  • a3118a8 fixes since moved types
  • c86eb8b chore(deps): Bump @​docker/actions-toolkit from 0.23.0 to 0.24.0
  • 2a53c6c Merge pull request #1122 from crazy-max/update-dev-deps
  • ccef1f2 chore: update generated content
  • 79117b6 chore: update dev dependencies
  • Additional commits viewable in compare view

Updates docker/login-action from 3.1.0 to 3.2.0

Release notes

Sourced from docker/login-action's releases.

v3.2.0

Full Changelog: docker/login-action@v3.1.0...v3.2.0

Commits
  • 0d4c9c5 Merge pull request #722 from crazy-max/update-readme
  • b29e14f add contributing section to README
  • 218a70c Merge pull request #721 from docker/dependabot/npm_and_yarn/docker/actions-to...
  • b820080 build(deps): bump @​docker/actions-toolkit from 0.23.0 to 0.24.0
  • 27530a9 Merge pull request #720 from docker/dependabot/npm_and_yarn/aws-sdk-dependenc...
  • d072a60 chore: update generated content
  • 7c627b5 build(deps): bump the aws-sdk-dependencies group across 1 directory with 2 up...
  • 787cfc6 Merge pull request #694 from docker/dependabot/npm_and_yarn/undici-5.28.4
  • 8e66e91 chore: update generated content
  • 5ba5e97 build(deps): bump undici from 5.28.3 to 5.28.4
  • Additional commits viewable in compare view

Updates goreleaser/goreleaser-action from 5.1.0 to 6.0.0

Release notes

Sourced from goreleaser/goreleaser-action's releases.

v6.0.0

[!WARNING] This is a breaking change!

Follow the instructions here to upgrade!

What's Changed

Full Changelog: goreleaser/goreleaser-action@v5...v6.0.0

Commits

Updates github/codeql-action from 3.25.6 to 3.25.8

Changelog

Sourced from github/codeql-action's changelog.

CodeQL Action Changelog

See the releases page for the relevant changes to the CodeQL CLI and language packs.

Note that the only difference between v2 and v3 of the CodeQL Action is the node version they support, with v3 running on node 20 while we continue to release v2 to support running on node 16. For example 3.22.11 was the first v3 release and is functionally identical to 2.22.11. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers.

[UNRELEASED]

No user facing changes.

3.25.8 - 04 Jun 2024

  • Update default CodeQL bundle version to 2.17.4. #2321

3.25.7 - 31 May 2024

  • We are rolling out a feature in May/June 2024 that will reduce the Actions cache usage of the Action by keeping only the newest TRAP cache for each language. #2306

3.25.6 - 20 May 2024

  • Update default CodeQL bundle version to 2.17.3. #2295

3.25.5 - 13 May 2024

  • Add a compatibility matrix of supported CodeQL Action, CodeQL CLI, and GitHub Enterprise Server versions to the https://github.com/github/codeql-action/blob/main/README.md. #2273
  • Avoid printing out a warning for a missing on.push trigger when the CodeQL Action is triggered via a workflow_call event. #2274
  • The tools: latest input to the init Action has been renamed to tools: linked. This option specifies that the Action should use the tools shipped at the same time as the Action. The old name will continue to work for backwards compatibility, but we recommend that new workflows use the new name. #2281

3.25.4 - 08 May 2024

  • Update default CodeQL bundle version to 2.17.2. #2270

3.25.3 - 25 Apr 2024

  • Update default CodeQL bundle version to 2.17.1. #2247
  • Workflows running on macos-latest using CodeQL CLI versions before v2.15.1 will need to either upgrade their CLI version to v2.15.1 or newer, or change the platform to an Intel MacOS runner, such as macos-12. ARM machines with SIP disabled, including the newest macos-latest image, are unsupported for CLI versions before 2.15.1. #2261

3.25.2 - 22 Apr 2024

No user facing changes.

3.25.1 - 17 Apr 2024

  • We are rolling out a feature in April/May 2024 that improves the reliability and performance of analyzing code when analyzing a compiled language with the autobuild build mode. #2235
  • Fix a bug where the init Action would fail if --overwrite was specified in CODEQL_ACTION_EXTRA_OPTIONS. #2245

3.25.0 - 15 Apr 2024

  • The deprecated feature for extracting dependencies for a Python analysis has been removed. #2224

... (truncated)

Commits
  • 2e230e8 Merge pull request #2323 from github/update-v3.25.8-18b06dd1d
  • 66ad891 Update changelog for v3.25.8
  • 18b06dd Merge pull request #2322 from github/dependabot/npm_and_yarn/npm-10d82c2911
  • 200dd0c Update checked-in dependencies
  • 2bb35ea bump the npm group with 4 updates
  • 9c15e42 Merge pull request #2321 from github/update-bundle/codeql-bundle-v2.17.4
  • 98e7922 Merge branch 'main' into update-bundle/codeql-bundle-v2.17.4
  • 440350b Add changelog note
  • d4fcc8b Update default bundle to codeql-bundle-v2.17.4
  • add199b Merge pull request #2320 from github/angelapwen/use-linked-in-tests
  • Additional commits viewable in compare view

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 <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

Bumps the ci group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [korthout/backport-action](https://github.com/korthout/backport-action) | `2.5.0` | `3.0.2` |
| [docker/build-push-action](https://github.com/docker/build-push-action) | `5.3.0` | `5.4.0` |
| [docker/login-action](https://github.com/docker/login-action) | `3.1.0` | `3.2.0` |
| [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) | `5.1.0` | `6.0.0` |
| [github/codeql-action](https://github.com/github/codeql-action) | `3.25.6` | `3.25.8` |



Updates `korthout/backport-action` from 2.5.0 to 3.0.2
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](korthout/backport-action@ef20d86...bd410d3)

Updates `docker/build-push-action` from 5.3.0 to 5.4.0
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@2cdde99...ca052bb)

Updates `docker/login-action` from 3.1.0 to 3.2.0
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@e92390c...0d4c9c5)

Updates `goreleaser/goreleaser-action` from 5.1.0 to 6.0.0
- [Release notes](https://github.com/goreleaser/goreleaser-action/releases)
- [Commits](goreleaser/goreleaser-action@5742e2a...286f3b1)

Updates `github/codeql-action` from 3.25.6 to 3.25.8
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@9fdb3e4...2e230e8)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: ci
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci
- dependency-name: goreleaser/goreleaser-action
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: ci
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added area/ci CI related issues and pull requests dependencies Pull requests that update a dependency labels Jun 11, 2024
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
@stefanprodan stefanprodan added the backport:release/v1.0.x To be backported to release/v1.0.x label Jun 11, 2024
@stefanprodan stefanprodan merged commit ad7e418 into main Jun 11, 2024
7 checks passed
@stefanprodan stefanprodan deleted the dependabot/github_actions/ci-6e6887dbc2 branch June 11, 2024 06:50
@fluxcdbot
Copy link
Member

Backport failed for release/v1.0.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/v1.0.x
git worktree add -d .worktree/backport-1004-to-release/v1.0.x origin/release/v1.0.x
cd .worktree/backport-1004-to-release/v1.0.x
git switch --create backport-1004-to-release/v1.0.x
git cherry-pick -x c8c450a02f077f6e72bc189084195521ed5d66be ffeb21acbea630e15d68db1cce4c5a412b3ec75d

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ci CI related issues and pull requests backport:release/v1.0.x To be backported to release/v1.0.x dependencies Pull requests that update a dependency
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants