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.
NOTE: if you are using this action within a matrix build and see failures attempting to upload artifacts with duplicate names, you will need to set the artifact-name to be unique based on the matrix properties (an example here). This is due to a change to use a newer GitHub API which no longer allows artifacts with duplicate names.
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
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
... (truncated)
Commits
2e230e8 Merge pull request #2323 from github/update-v3.25.8-18b06dd1d
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 6 updates in the / directory:
4.1.4
4.1.6
2.5.0
3.0.2
3.1.0
3.2.0
0.15.11
0.16.0
5.0.0
6.0.0
2.13.4
3.25.8
Updates
actions/checkout
from 4.1.4 to 4.1.6Release notes
Sourced from actions/checkout's releases.
Changelog
Sourced from actions/checkout's changelog.
... (truncated)
Commits
a5ac7e5
Update for 4.1.6 release (#1733)24ed1a3
Check platform for extension (#1732)44c2b7a
README: Suggestuser.email
to be `41898282+github-actions[bot]@users
.norepl...8459bc0
Bump actions/upload-artifact from 2 to 4 (#1695)3f603f6
Bump actions/setup-node from 1 to 4 (#1696)fd084cd
Bump github/codeql-action from 2 to 3 (#1694)9c1e94e
Update NPM dependencies (#1703)Updates
korthout/backport-action
from 2.5.0 to 3.0.2Release notes
Sourced from korthout/backport-action's releases.
... (truncated)
Commits
bd410d3
dist: release 3.0.27e34d5f
dist: build new artifacts9237785
Merge pull request #423 from korthout/korthout-fix-draft-checkout8fef44e
fix: checkout branch not targetf73aeb9
dist: release 3.1.0-SNAPSHOTecb5bc3
dist: release 3.0.1c7a7132
dist: build new artifactsda478f7
Merge pull request #422 from korthout/korthout-fix-draft-conflict-suggestions863937d
fix: fetch and checkout draft pr branch directly7d390fd
dist: release 3.1.0-SNAPSHOTUpdates
docker/login-action
from 3.1.0 to 3.2.0Release notes
Sourced from docker/login-action's releases.
Commits
0d4c9c5
Merge pull request #722 from crazy-max/update-readmeb29e14f
add contributing section to README218a70c
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.027530a9
Merge pull request #720 from docker/dependabot/npm_and_yarn/aws-sdk-dependenc...d072a60
chore: update generated content7c627b5
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.48e66e91
chore: update generated content5ba5e97
build(deps): bump undici from 5.28.3 to 5.28.4Updates
anchore/sbom-action
from 0.15.11 to 0.16.0Release notes
Sourced from anchore/sbom-action's releases.
Commits
e8d2a69
chore(deps): update Syft to v1.4.1 (#465)610bea4
chore: update GitHub artifact client (#463)0445e23
chore(deps): bump actions/checkout from 4.1.4 to 4.1.5 (#464)a66e2f3
chore(deps): bump actions/checkout from 4.1.2 to 4.1.4 (#461)1abd786
chore(deps): bump peter-evans/create-pull-request from 6.0.2 to 6.0.5 (#462)Updates
goreleaser/goreleaser-action
from 5.0.0 to 6.0.0Release notes
Sourced from goreleaser/goreleaser-action's releases.
Commits
286f3b1
ci: fix testsbeac410
ci: update workflow and .goreleaser.yml18bbabc
feat!: use "~> v2" as default (#463)5742e2a
chore: re-generate70ccc5d
chore(deps): bump@actions/http-client
from 2.2.0 to 2.2.1 (#451)d55bec7
chore(deps): bump semver from 7.6.0 to 7.6.2 (#462)f1dbd53
feat: lock this major version of the action to use '~> v1' as 'latest' (#461)2953d07
chore(deps): update http-client62d4b8a
chore: use corepack to install yarn (#458)f09f1a7
chore(deps): bump tar from 6.1.14 to 6.2.1 (#456)Updates
github/codeql-action
from 2.13.4 to 3.25.8Release notes
Sourced from github/codeql-action's releases.
... (truncated)
Changelog
Sourced from github/codeql-action's changelog.
... (truncated)
Commits
2e230e8
Merge pull request #2323 from github/update-v3.25.8-18b06dd1d66ad891
Update changelog for v3.25.818b06dd
Merge pull request #2322 from github/dependabot/npm_and_yarn/npm-10d82c2911200dd0c
Update checked-in dependencies2bb35ea
bump the npm group with 4 updates9c15e42
Merge pull request #2321 from github/update-bundle/codeql-bundle-v2.17.498e7922
Merge branch 'main' into update-bundle/codeql-bundle-v2.17.4440350b
Add changelog noted4fcc8b
Update default bundle to codeql-bundle-v2.17.4add199b
Merge pull request #2320 from github/angelapwen/use-linked-in-testsDependabot 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