Skip to content

Merge main into releases/v2 #1875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 39 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7cd0443
Update changelog and version after v2.21.5
github-actions[bot] Aug 28, 2023
f644ffe
Update checked-in dependencies
github-actions[bot] Aug 28, 2023
b88b550
Merge pull request #1859 from github/mergeback/v2.21.5-to-main-00e563ea
Aug 28, 2023
d721f69
Add better error messages when determining merge-base
aeisenberg Aug 28, 2023
8ecc33d
Bump the npm group with 5 updates (#1856)
dependabot[bot] Aug 29, 2023
09940b4
Address comments from PR
aeisenberg Aug 29, 2023
e603106
Add change note
aeisenberg Aug 29, 2023
4697868
Address more comments from PR
aeisenberg Aug 29, 2023
c5acfe3
Merge pull request #1860 from github/aeisenberg/better-error-messages
aeisenberg Aug 29, 2023
07d42ec
Improve logging for Go autobuild when invoked in analyze step (#1862)
angelapwen Aug 31, 2023
7aafc67
Bump the npm group with 3 updates
dependabot[bot] Sep 4, 2023
3115e0f
Update checked-in dependencies
github-actions[bot] Sep 4, 2023
321d3e0
Bump the actions group with 1 update
dependabot[bot] Sep 4, 2023
466ed42
Enable scaling reserved RAM on GHES
henrymercer Sep 5, 2023
574dbbc
Allow customizing the scaling threshold with an environment variable
henrymercer Sep 5, 2023
10389f6
Remove scaling reserved RAM feature flag
henrymercer Sep 5, 2023
270788d
Remove language-specific baseline configuration flag
henrymercer Sep 5, 2023
5150b5c
Add changelog note
henrymercer Sep 5, 2023
bec071a
Add changelog note
henrymercer Sep 5, 2023
d5d81f4
bump checkout to v4 in sync.py
TomBolton Sep 5, 2023
85cd5ad
update checkout version in pr-checks/checks
TomBolton Sep 5, 2023
e6cb4fe
Improve usability of update dependencies workflow
henrymercer Sep 5, 2023
9429343
Merge pull request #1865 from github/dependabot/github_actions/action…
TomBolton Sep 5, 2023
7bffcb4
Merge pull request #1864 from github/dependabot/npm_and_yarn/npm-18a1…
TomBolton Sep 5, 2023
37d8d03
Merge pull request #1868 from github/henrymercer/improve-dependency-u…
henrymercer Sep 5, 2023
798e74c
Merge pull request #1867 from github/henrymercer/remove-language-base…
henrymercer Sep 5, 2023
f4683e8
Update supported GitHub Enterprise Server versions
github-actions[bot] Sep 6, 2023
45d66af
Merge pull request #1870 from github/update-supported-enterprise-serv…
henrymercer Sep 6, 2023
583a101
Mark invalid SARIF errors as user errors in the `upload-sarif` Action
henrymercer Sep 6, 2023
077672f
Merge branch 'main' into henrymercer/enable-scaling-reserved-ram-ghes
henrymercer Sep 6, 2023
4764dce
Merge pull request #1866 from github/henrymercer/enable-scaling-reser…
henrymercer Sep 7, 2023
7218de5
Merge branch 'main' into henrymercer/user-errors-for-upload-sarif
henrymercer Sep 7, 2023
a7c12a5
Address PR comments
henrymercer Sep 7, 2023
43750fe
Merge pull request #1872 from github/henrymercer/user-errors-for-uplo…
henrymercer Sep 7, 2023
da65035
Update default bundle to codeql-bundle-v2.14.4
github-actions[bot] Sep 8, 2023
88c7a5c
Add changelog note
github-actions[bot] Sep 8, 2023
6a6a824
Merge pull request #1873 from github/update-bundle/codeql-bundle-v2.14.4
cklin Sep 12, 2023
5462f69
Update changelog for v2.21.6
github-actions[bot] Sep 13, 2023
1b62990
Fix misplaced changelog entry
cklin Sep 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th

## [UNRELEASED]

No user facing changes.
- Enable improved file coverage information for GitHub Enterprise Server users. This feature is already available to GitHub.com users. [#1867](https://github.com/github/codeql-action/pull/1867)

## 2.21.5 - 28 Aug 2023

Expand Down
8 changes: 6 additions & 2 deletions lib/codeql.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/codeql.js.map

Large diffs are not rendered by default.

12 changes: 1 addition & 11 deletions lib/feature-flags.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/feature-flags.js.map

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion src/codeql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,11 @@ export const CODEQL_VERSION_DIAGNOSTICS_EXPORT_FIXED = "2.13.1";
*/
export const CODEQL_VERSION_RESOLVE_ENVIRONMENT = "2.13.4";

/**
* Versions 2.14.2+ of the CodeQL CLI support language-specific baseline configuration.
*/
export const CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG = "2.14.2";

/**
* Set up CodeQL CLI access.
*
Expand Down Expand Up @@ -576,7 +581,10 @@ export async function getCodeQLForCmd(
}

if (
await features.getValue(Feature.LanguageBaselineConfigEnabled, this)
await util.codeQlVersionAbove(
this,
CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG,
)
) {
extraArgs.push("--calculate-language-specific-baseline");
}
Expand Down
11 changes: 0 additions & 11 deletions src/feature-flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ export const CODEQL_VERSION_ANALYSIS_SUMMARY_V2 = "2.14.0";
*/
export const CODEQL_VERSION_INTRA_LAYER_PARALLELISM = "2.14.0";

/**
* Versions 2.14.2+ of the CodeQL CLI support language-specific baseline configuration.
*/
export const CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG = "2.14.2";

export interface CodeQLDefaultVersionInfo {
cliVersion: string;
tagName: string;
Expand Down Expand Up @@ -60,7 +55,6 @@ export enum Feature {
DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled",
EvaluatorIntraLayerParallelismEnabled = "evaluator_intra_layer_parallelism_enabled",
ExportDiagnosticsEnabled = "export_diagnostics_enabled",
LanguageBaselineConfigEnabled = "language_baseline_config_enabled",
MlPoweredQueriesEnabled = "ml_powered_queries_enabled",
QaTelemetryEnabled = "qa_telemetry_enabled",
ScalingReservedRamEnabled = "scaling_reserved_ram_enabled",
Expand Down Expand Up @@ -101,11 +95,6 @@ export const featureConfig: Record<
minimumVersion: "2.12.4",
defaultValue: true,
},
[Feature.LanguageBaselineConfigEnabled]: {
envVar: "CODEQL_ACTION_LANGUAGE_BASELINE_CONFIG",
minimumVersion: CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG,
defaultValue: false,
},
[Feature.MlPoweredQueriesEnabled]: {
envVar: "CODEQL_ML_POWERED_QUERIES",
minimumVersion: undefined,
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy