Skip to content

Commit 16aecb7

Browse files
committed
Merge branch 'main' into mbg/deprecate-getRunnerLogger
2 parents 8bb7f8f + c5a2f4b commit 16aecb7

25 files changed

Lines changed: 448 additions & 249 deletions

‎.github/copilot-instructions.md‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ The CodeQL Action is used in GitHub Actions workflows to run CodeQL scans using
1111

1212
## Review instructions
1313

14-
- When wording review comments, be helpful and friendly. Assume that the PR author has written the code with the best of intentions. Word your comments constructively as suggestions for improvements. Do not word suggestions as commands.
14+
- Prioritise identifying critical issues, such as logic bugs, over comments on documentation or typos.
15+
- When wording review comments, be helpful and friendly. Assume that the PR author has written the code with the best of intentions. Never word suggestions as commands or using the imperative. Examples of what you should never write: "Preserve that non-fatal behaviour here" or "Please preserve that non-fatal behaviour here".
16+
- When writing feedback, assume that the PR author is competent and is able to understand whether the point you are making is valid or not, why you are raising it, and how to best address it. While you can suggest how to address a point you are making, don't phrase it as a requirement or assume that it is the only solution.
17+
- Always word your comments constructively as suggestions for improvements, for example: "It would make sense to ..." or "Could you add ...?" or "Would it make sense to ...?"
1518
- If you want to comment on a change that you believe will fail a CI check, do not present the CI failure you expect as a fact. Instead, write that you think a change "may" lead to a failure in CI. Suggest that, if such a failure manifests, the changes you are commenting on may be the place responsible for the failure and are worth looking at.
16-
- If a suggestion you make is suitable for a follow-up, such as a refactoring that doesn't change the behaviour or fixing a typo in a comment, mention that it can be addressed in a later PR rather than blocking this one.
19+
- If a suggestion you make is suitable for a follow-up, such as a refactoring that doesn't change the behaviour or fixing a typo in a comment, mention that it can be addressed in a later PR rather than blocking this one or prefix your comment with "Minor: ".
1720
- If a change is a net improvement, for example because it improves on an existing limitation of existing code, do not complain about pre-existing problems that remain. You may comment on them, but you should make it clear that the thing you are commenting on is not new by writing e.g. "Not new in this PR, but [..]" followed by your description of the issue and a suggestion that it could be improved at the same time with e.g. "Consider whether this is worth addressing as part of this PR as well."
1821

1922
## Generated code
@@ -22,6 +25,16 @@ The main codebase of the CodeQL Action is written in TypeScript and compiled to
2225

2326
GitHub Actions workflows in the `.github/workflows` directory whose filenames start with two underscores (e.g. `__all-platform-bundle.yml`) are automatically generated using the `pr-checks/sync.sh` script from template files in the `pr-checks/checks` directory. Therefore, you do not need to review files in the `.github/workflows` directory that start with two underscores. However, you should review changes to the `pr-checks` directory as well as workflows in the `.github/workflows` directory that do not start with underscores.
2427

28+
## Feature flags
29+
30+
Some functionality in the code may be gated behind feature flags, which are controlled server-side. If the functionality that is gated behind them is user-facing, then this should be documented in a change note at the time that the gated functionality is added. See `CHANGELOG.md` for existing notes that mention "experimental" for examples. These typically include information about when users may expect to see the feature rolled out.
31+
32+
When a feature flag that gates some functionality is removed, this does not need to be documented in a change note since the feature is already rolled out and the notes for the release which introduced the feature already describe it. The only exception is functionality which will start having an effect on GHES as a result of the feature flag removal:
33+
34+
- Most functionality gated behind feature flags does not affect GHES.
35+
- We can make functionality available on GHES by setting `defaultValue` to `true` first and waiting for this to have had an effect on GHES. No change note is needed if a feature flag is removed where `defaultValue` was `true`.
36+
- When removing a feature flag where `defaultValue` was `false` and the functionality starts to affect GHES, a change note may be appropriate.
37+
2538
## Release process
2639

2740
Changes that are merged to the `main` branch are not used in production straight away. Instead, changes from `main` must first be released using the release process, which has to be manually triggered by a staff member. Therefore, it is possible for further changes to be made to the code after some changes have been merged to `main` but before they are released. Once the release process automation is started, a series of PRs are automatically generated:

‎.github/workflows/__diagnostics-export.yml‎

Lines changed: 13 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/pr-checks.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: PR Checks
22

33
on:
44
push:
5+
branches:
6+
- "main"
7+
- "releases/v*"
58
pull_request:
69
merge_group:
710
types: [checks_requested]
@@ -145,12 +148,11 @@ jobs:
145148
146149
- name: Fetch base commit
147150
id: fetch-base
148-
# Forks and Dependabot PRs don't have permission to write comments, so skip the repo size
149-
# check in those cases.
151+
# Skip this (and subsequent steps) if the PR originates from a fork, since this workflow
152+
# won't have the necessary permissions to post comments on the PR.
150153
if: >-
151154
github.event_name == 'pull_request' &&
152-
github.event.pull_request.head.repo.full_name == github.repository &&
153-
github.event.pull_request.user.login != 'dependabot[bot]'
155+
github.event.pull_request.head.repo.full_name == github.repository
154156
env:
155157
BASE_SHA: ${{ github.event.pull_request.base.sha }}
156158
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
@@ -209,7 +211,7 @@ jobs:
209211
if: >-
210212
github.event_name == 'pull_request' &&
211213
github.event.pull_request.head.repo.full_name == github.repository &&
212-
github.event.pull_request.user.login != 'dependabot[bot]' &&
214+
github.actor != 'dependabot[bot]' &&
213215
needs.other-checks.result == 'success'
214216
permissions:
215217
contents: read

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
44

55
## [UNRELEASED]
66

7-
No user facing changes.
7+
- Update default CodeQL bundle version to [2.27.3](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.27.3). [#4256](https://github.com/github/codeql-action/pull/4256)
88

99
## 4.39.0 - 15 Oct 2026
1010

‎init/action.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,10 @@ inputs:
153153
required: false
154154
trap-caching:
155155
description: >-
156-
Explicitly enable or disable TRAP caching rather than respecting the feature flag for it.
156+
Explicitly enable or disable TRAP caching instead of using the automatically determined default.
157+
TRAP caching is disabled by default when improved incremental analysis is enabled,
158+
because improved incremental analysis of a pull request only extracts changed files,
159+
which rarely benefit from TRAP caching.
157160
required: false
158161
dependency-caching:
159162
description: >-

‎lib/defaults.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.27.2",
3-
"cliVersion": "2.27.2",
4-
"priorBundleVersion": "codeql-bundle-v2.27.1",
5-
"priorCliVersion": "2.27.1"
2+
"bundleVersion": "codeql-bundle-v2.27.3",
3+
"cliVersion": "2.27.3",
4+
"priorBundleVersion": "codeql-bundle-v2.27.2",
5+
"priorCliVersion": "2.27.2"
66
}

0 commit comments

Comments
 (0)