Repository navigation
Merge main into releases/v4 - #4102
Merged
Merged
Conversation
Add six feature flags, overlay_analysis_min_disk_8_gb through overlay_analysis_min_disk_13_gb, which will be used to control the amount of available disk space that overlay analysis requires. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Overlay analysis required 20 GB of available disk space, lowered to 14 GB when overlay_analysis_resource_checks_v2 was enabled. That gave us a single step to roll out, and any further reduction needed another flag and another release. Determine the threshold from the new overlay_analysis_min_disk_N_gb flags instead, taking the lowest one that is enabled so that a lower limit can be rolled out to a subset of repositories without first disabling the flag above it. When none are enabled, the 14 GB limit now applies unconditionally, replacing the 20 GB default. Thresholds remain in decimal MB, matching the bytes-per-MB convention the disk check already used, so the effective byte values are unchanged from the previous 14 GB path. Also log the available and required space at debug level when the check passes, so that run logs show which threshold took effect. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
The flag no longer has any effect now that its 14 GB threshold is the unconditional default, so remove it. Setting CODEQL_ACTION_OVERLAY_ANALYSIS_RESOURCE_CHECKS_V2 no longer does anything. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Say "at or above" in the debug message logged when the check passes, since the comparison accepts exactly the minimum. Check each feature flag against the threshold its name declares, rather than only exercising a few of them, so that a mistake in one of the mappings cannot go unnoticed. Both sides of the boundary are needed to pin a threshold down: a mapping to a lower value would still pass the case at the limit, and one to a higher value would still fail the case below it. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
The comparison accepts exactly the minimum, so say "at or above", to match the wording of the disk space check. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This is particularly important for the first time that `getCachedCodeQlVersion` is invoked, as this cache file will not yet exist.
Co-authored-by: Michael B. Gale <mbg@github.com>
This brings them out of the crowded all-purpose `util.ts` and into `cli/output-cache.ts` where they are exclusively used.
This will ensure it works nicely with `JSON.stringify`. And, then we can validate the type before marshaling.
Mergeback v4.37.7 refs/heads/releases/v4 into main
# Conflicts: # lib/entry-points.js
Persist CodeQL version output to file rather than environment
…ation-error Make `EACCES` when installing CodeQL CLI a `ConfigurationError`
Resolve the overlap with the separately shipped promotion of the overlay resource checks while preserving the feature-flagged minimum disk thresholds. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Document each minimum disk feature flag individually and replace the tuple list with an explicit feature-to-threshold mapping. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Determine the overlay minimum disk space requirement from feature flags
henrymercer
approved these changes
Aug 21, 2026
henrymercer
enabled auto-merge
August 21, 2026 12:10
6 tasks
ryanduguid
added a commit
to EquityBot/DiogenesLamp
that referenced
this pull request
Aug 31, 2026
The bump moves github/codeql-action/init and /analyze from ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd to db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28, and test_active_workflow_document_is_exact[codeql.yml] refused it, as designed: EXPECTED_CODEQL is built from EXPECTED_ACTIONS, so the workflow and its recorded contract have to move in one commit. Reviewed before recording. db488dde is the merge of github/codeql-action#4102, update-v4.37.8, and the only tag pointing at it is v4.37.8, one patch on from the recorded v4.37.7. Both steps move together to the same commit, the `# v4` comment stays truthful for the major line, and codeql.yml is otherwise untouched: no permission, trigger or fail-closed change. Worth noting the floating v4 tag now resolves to cdf488f5 (v4.37.9), so this pin is one patch behind head of the line by the time it lands; Dependabot will raise that separately. EXPECTED_ACTIONS and test_codeql_major_comments_have_reviewed_exact_release_provenance now name db488dde and v4.37.8. The contract stays coupled: reverting codeql.yml to the old SHA against the new record still fails the exactness test, checked locally. 41 passed.
ryanduguid
added a commit
to EquityBot/DiogenesLamp
that referenced
this pull request
Aug 31, 2026
* Bump the codeql-action group with 2 updates Bumps the codeql-action group with 2 updates: [github/codeql-action/init](https://github.com/github/codeql-action) and [github/codeql-action/analyze](https://github.com/github/codeql-action). Updates `github/codeql-action/init` from 4.37.7 to 4.37.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@ff2f1c6...db488dd) Updates `github/codeql-action/analyze` from 4.37.7 to 4.37.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@ff2f1c6...db488dd) --- updated-dependencies: - dependency-name: github/codeql-action/init dependency-version: 4.37.8 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: codeql-action - dependency-name: github/codeql-action/analyze dependency-version: 4.37.8 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: codeql-action ... Signed-off-by: dependabot[bot] <support@github.com> * Record the reviewed provenance for codeql-action v4.37.8 The bump moves github/codeql-action/init and /analyze from ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd to db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28, and test_active_workflow_document_is_exact[codeql.yml] refused it, as designed: EXPECTED_CODEQL is built from EXPECTED_ACTIONS, so the workflow and its recorded contract have to move in one commit. Reviewed before recording. db488dde is the merge of github/codeql-action#4102, update-v4.37.8, and the only tag pointing at it is v4.37.8, one patch on from the recorded v4.37.7. Both steps move together to the same commit, the `# v4` comment stays truthful for the major line, and codeql.yml is otherwise untouched: no permission, trigger or fail-closed change. Worth noting the floating v4 tag now resolves to cdf488f5 (v4.37.9), so this pin is one patch behind head of the line by the time it lands; Dependabot will raise that separately. EXPECTED_ACTIONS and test_codeql_major_comments_have_reviewed_exact_release_provenance now name db488dde and v4.37.8. The contract stays coupled: reverting codeql.yml to the old SHA against the new record still fails the exactness test, checked locally. 41 passed. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ryan Duguid <ryan@duguid.com.au>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merging 9ee088e into
releases/v4.Conductor for this PR is @henrymercer.
Contains the following pull requests:
EACCESwhen installing CodeQL CLI aConfigurationError#4098 (@mbg)Please do the following:
releases/v4branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.