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.
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.
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.
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.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
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 autobuildbuild 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
As a result, the following inputs and environment variables are now ignored:
The setup-python-dependencies input to the init Action
The CODEQL_ACTION_DISABLE_PYTHON_DEPENDENCY_INSTALLATION environment variable
... (truncated)
Commits
f079b84 Merge pull request #2317 from github/update-v3.25.7-a095bf2a1
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 ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore 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 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 ` 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 ` will remove all of the ignore conditions of the specified dependency
- `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Bumps the ci group with 3 updates in the / directory: korthout/backport-action, docker/login-action and github/codeql-action.
Updates
korthout/backport-actionfrom 2.5.0 to 3.0.2Release notes
Sourced from korthout/backport-action's releases.
... (truncated)
Commits
bd410d3dist: release 3.0.27e34d5fdist: build new artifacts9237785Merge pull request #423 from korthout/korthout-fix-draft-checkout8fef44efix: checkout branch not targetf73aeb9dist: release 3.1.0-SNAPSHOTecb5bc3dist: release 3.0.1c7a7132dist: build new artifactsda478f7Merge pull request #422 from korthout/korthout-fix-draft-conflict-suggestions863937dfix: fetch and checkout draft pr branch directly7d390fddist: release 3.1.0-SNAPSHOTUpdates
docker/login-actionfrom 3.1.0 to 3.2.0Release notes
Sourced from docker/login-action's releases.
Commits
0d4c9c5Merge pull request #722 from crazy-max/update-readmeb29e14fadd contributing section to README218a70cMerge pull request #721 from docker/dependabot/npm_and_yarn/docker/actions-to...b820080build(deps): bump@docker/actions-toolkitfrom 0.23.0 to 0.24.027530a9Merge pull request #720 from docker/dependabot/npm_and_yarn/aws-sdk-dependenc...d072a60chore: update generated content7c627b5build(deps): bump the aws-sdk-dependencies group across 1 directory with 2 up...787cfc6Merge pull request #694 from docker/dependabot/npm_and_yarn/undici-5.28.48e66e91chore: update generated content5ba5e97build(deps): bump undici from 5.28.3 to 5.28.4Updates
github/codeql-actionfrom 3.25.6 to 3.25.7Changelog
Sourced from github/codeql-action's changelog.
... (truncated)
Commits
f079b84Merge pull request #2317 from github/update-v3.25.7-a095bf2a1e1a4268Update changelog for v3.25.7a095bf2Merge pull request #2313 from github/revert-2312-update-bundle/codeql-bundle-...bbd4e19Revert "Update default bundle to 2.17.4"9ab5d16Merge pull request #2312 from github/update-bundle/codeql-bundle-v2.17.4028346eAdd changelog note5fe0847Update default bundle to codeql-bundle-v2.17.49550da9Merge pull request #2311 from github/henrymercer/pack-missing-auth-config-error6548a4dAdd configuration error for missing auth to package registry7927df0Bump micromatch from 4.0.5 to 4.0.7 in the npm group (#2310)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