Skip to content

Commit 1a18e90

Browse files
authored
Merge branch 'main' into mario-campos/warn-on-changelog-write
2 parents 68a9dcb + b46c2ee commit 1a18e90

176 files changed

Lines changed: 22368 additions & 10611 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/prepare-test/action.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ inputs:
66
required: true
77
use-all-platform-bundle:
88
description: "If true, we output a tools URL with codeql-bundle.tar.gz file rather than platform-specific URL"
9-
default: 'false'
9+
default: "false"
1010
required: false
1111
setup-kotlin:
1212
description: "If true, we setup kotlin"
13-
default: 'true'
13+
default: "true"
1414
required: true
1515
outputs:
1616
tools-url:
@@ -73,7 +73,10 @@ runs:
7373
exit 1
7474
fi
7575
76-
- uses: fwilhe2/setup-kotlin@9c245a6425255f5e98ba1ce6c15d31fce7eca9da
76+
- uses: fwilhe2/setup-kotlin@b325539ca8f6e1d9ee04efed06f49bdbf5426dbb # v2.1
7777
if: ${{ inputs.setup-kotlin == 'true' }}
7878
with:
79-
version: 1.8.21
79+
# Kotlin is installed on the runners by default, but the version that is pre-installed is too new
80+
# to be supported by CodeQL. This Kotlin version is selected to be compatible with both the default Java
81+
# version on the `ubuntu-latest` runners and CodeQL.
82+
version: 2.1.20

‎.github/actions/release-initialise/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
shell: bash
1717

1818
- name: Set up Node
19-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
19+
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
2020
with:
2121
node-version: 24
2222
cache: 'npm'

‎.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/dependabot.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ updates:
1616
# This might be fixed when we move to eslint v9.
1717
- dependency-name: "eslint-plugin-import"
1818
versions: [">=2.30.0"]
19+
20+
# Some of our dependencies are lagging behind with support for new versions of
21+
# `undici` which is why we have to override it in `package.json`. Dependabot
22+
# workflows fail when they try to update a dependency that is explicitly
23+
# overriden. Since this happens somewhat routinely at the moment, we are
24+
# excluding `undici` here and have to manually update it when needed.
25+
- dependency-name: "undici"
26+
versions: [">=7.30.1"]
1927
groups:
2028
npm-minor:
2129
patterns:
@@ -26,7 +34,7 @@ updates:
2634
- package-ecosystem: github-actions
2735
directories:
2836
- "/.github/workflows"
29-
- "/.github/actions"
37+
- "/.github/actions/*/"
3038
schedule:
3139
interval: weekly
3240
cooldown:

‎.github/workflows/__analysis-kinds.yml‎

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

‎.github/workflows/__autobuild-direct-tracing-with-working-dir.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__build-mode-autobuild.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/__bundle-from-toolcache.yml‎

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

‎.github/workflows/__bundle-toolcache.yml‎

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

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)