From 5bdb913da11ac3b7db87fced3be7d5b04d836809 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Fri, 30 Oct 2026 11:00:42 +0000 Subject: [PATCH] Rename FF to include "Abort" instead of "Skip" --- .github/workflows/__unsupported-macos.yml | 2 +- lib/entry-points.js | 18 +++++++++--------- pr-checks/checks/unsupported-macos.yml | 2 +- src/feature-flags.ts | 6 +++--- src/languages/traced.test.ts | 4 ++-- src/languages/traced.ts | 16 ++++++++-------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/__unsupported-macos.yml b/.github/workflows/__unsupported-macos.yml index 8f4a473df..a888ce757 100644 --- a/.github/workflows/__unsupported-macos.yml +++ b/.github/workflows/__unsupported-macos.yml @@ -74,7 +74,7 @@ jobs: continue-on-error: true env: CODEQL_ACTION_CHECK_UNSUPPORTED_TRACED_ANALYSIS: true - CODEQL_ACTION_SKIP_UNSUPPORTED_TRACED_ANALYSIS: true + CODEQL_ACTION_ABORT_UNSUPPORTED_TRACED_ANALYSIS: true with: languages: swift tools: ${{ steps.prepare-test.outputs.tools-url }} diff --git a/lib/entry-points.js b/lib/entry-points.js index afb99c091..26dc274b7 100644 --- a/lib/entry-points.js +++ b/lib/entry-points.js @@ -179947,9 +179947,9 @@ var featureConfig = { envVar: "CODEQL_ACTION_START_PROXY_USE_FEATURES_RELEASE", minimumVersion: void 0 }, - ["skip_unsupported_traced_analysis" /* SkipUnsupportedTracedAnalysis */]: { + ["abort_unsupported_traced_analysis" /* AbortUnsupportedTracedAnalysis */]: { defaultValue: false, - envVar: "CODEQL_ACTION_SKIP_UNSUPPORTED_TRACED_ANALYSIS", + envVar: "CODEQL_ACTION_ABORT_UNSUPPORTED_TRACED_ANALYSIS", minimumVersion: void 0 }, ["tools_repository_property" /* ToolsRepositoryProperty */]: { @@ -193924,7 +193924,7 @@ async function checkSwiftCompatibility(config, codeql, darwinVersion2) { // src/languages/traced.ts var UNSUPPORTED_DARWIN_FOR_TRACED = 27; var UNSUPPORTED_XCODE_FOR_TRACED = 27; -function handleUnsupportedVersion(logger2, config, tracedLanguages, skipUnsupportedTracedAnalysis, product, version) { +function handleUnsupportedVersion(logger2, config, tracedLanguages, abortUnsupportedTracedAnalysis, product, version) { const baseMessage = [ `Traced analysis is not supported on ${product} ${UNSUPPORTED_DARWIN_FOR_TRACED} or above.`, `Configure your analysis to run on macOS ${UNSUPPORTED_DARWIN_FOR_TRACED - 1} or below`, @@ -193947,7 +193947,7 @@ function handleUnsupportedVersion(logger2, config, tracedLanguages, skipUnsuppor baseMessage, `For more information, see [this announcement](${"https://github.blog/changelog/2026-10-19-codeql-changes-for-macos-27-xcode-27-and-swift-6-4/" /* UNSUPPORTED_TRACED_ANALYSIS_MACOS27 */}).` ].join(" "), - severity: skipUnsupportedTracedAnalysis ? "error" : "warning", + severity: abortUnsupportedTracedAnalysis ? "error" : "warning", visibility: { cliSummaryTable: true, statusPage: true, @@ -193961,7 +193961,7 @@ function handleUnsupportedVersion(logger2, config, tracedLanguages, skipUnsuppor baseMessage, `For more information, see ${"https://github.blog/changelog/2026-10-19-codeql-changes-for-macos-27-xcode-27-and-swift-6-4/" /* UNSUPPORTED_TRACED_ANALYSIS_MACOS27 */}` ].join(" "); - if (skipUnsupportedTracedAnalysis) { + if (abortUnsupportedTracedAnalysis) { throw new ConfigurationError(logMessage); } else { logger2.warning(logMessage); @@ -194004,8 +194004,8 @@ async function checkRunnerSupportsTracedAnalysis(action, config, codeql) { ); return; } - const skipUnsupportedTracedAnalysis = await action.features.getValue( - "skip_unsupported_traced_analysis" /* SkipUnsupportedTracedAnalysis */ + const abortUnsupportedTracedAnalysis = await action.features.getValue( + "abort_unsupported_traced_analysis" /* AbortUnsupportedTracedAnalysis */ ); if (typeof version === "string") { action.logger.warning( @@ -194016,7 +194016,7 @@ async function checkRunnerSupportsTracedAnalysis(action, config, codeql) { action.logger, config, tracedLanguages, - skipUnsupportedTracedAnalysis, + abortUnsupportedTracedAnalysis, "macOS", version ); @@ -194034,7 +194034,7 @@ async function checkRunnerSupportsTracedAnalysis(action, config, codeql) { action.logger, config, tracedLanguages, - skipUnsupportedTracedAnalysis, + abortUnsupportedTracedAnalysis, "Xcode", xcodeVer ); diff --git a/pr-checks/checks/unsupported-macos.yml b/pr-checks/checks/unsupported-macos.yml index d417e6082..5881b174a 100644 --- a/pr-checks/checks/unsupported-macos.yml +++ b/pr-checks/checks/unsupported-macos.yml @@ -28,7 +28,7 @@ steps: continue-on-error: true env: CODEQL_ACTION_CHECK_UNSUPPORTED_TRACED_ANALYSIS: true - CODEQL_ACTION_SKIP_UNSUPPORTED_TRACED_ANALYSIS: true + CODEQL_ACTION_ABORT_UNSUPPORTED_TRACED_ANALYSIS: true with: languages: swift tools: ${{ steps.prepare-test.outputs.tools-url }} diff --git a/src/feature-flags.ts b/src/feature-flags.ts index 36fccc6aa..a321b941f 100644 --- a/src/feature-flags.ts +++ b/src/feature-flags.ts @@ -150,7 +150,7 @@ export enum Feature { OverlayAnalysisStatusSave = "overlay_analysis_status_save", QaTelemetryEnabled = "qa_telemetry_enabled", /** Whether we should fail early if we detect that traced analysis is unsupported. */ - SkipUnsupportedTracedAnalysis = "skip_unsupported_traced_analysis", + AbortUnsupportedTracedAnalysis = "abort_unsupported_traced_analysis", /** Routes (some) API requests through the registry proxy. */ ProxyApiRequests = "proxy_api_requests", /** Note that this currently only disables baseline file coverage information. */ @@ -422,9 +422,9 @@ export const featureConfig = { envVar: "CODEQL_ACTION_START_PROXY_USE_FEATURES_RELEASE", minimumVersion: undefined, }, - [Feature.SkipUnsupportedTracedAnalysis]: { + [Feature.AbortUnsupportedTracedAnalysis]: { defaultValue: false, - envVar: "CODEQL_ACTION_SKIP_UNSUPPORTED_TRACED_ANALYSIS", + envVar: "CODEQL_ACTION_ABORT_UNSUPPORTED_TRACED_ANALYSIS", minimumVersion: undefined, }, [Feature.ToolsRepositoryProperty]: { diff --git a/src/languages/traced.test.ts b/src/languages/traced.test.ts index d14af8b47..71c3c5757 100644 --- a/src/languages/traced.test.ts +++ b/src/languages/traced.test.ts @@ -278,7 +278,7 @@ test.serial( const features = createFeatures([ Feature.CheckUnsupportedTracedAnalysis, - Feature.SkipUnsupportedTracedAnalysis, + Feature.AbortUnsupportedTracedAnalysis, ]); const codeql = await getCodeQLWithTracedStub( @@ -518,7 +518,7 @@ test.serial( const features = createFeatures([ Feature.CheckUnsupportedTracedAnalysis, - Feature.SkipUnsupportedTracedAnalysis, + Feature.AbortUnsupportedTracedAnalysis, ]); const codeql = await getCodeQLWithTracedStub( diff --git a/src/languages/traced.ts b/src/languages/traced.ts index 7d73595cf..bf9f3b781 100644 --- a/src/languages/traced.ts +++ b/src/languages/traced.ts @@ -26,7 +26,7 @@ export const UNSUPPORTED_XCODE_FOR_TRACED = 27; * @param logger The logger to use. * @param config The CodeQL Action configuration. * @param tracedLanguages Traced languages that are configured for analysis. - * @param skipUnsupportedTracedAnalysis Whether this is a fatal error. + * @param abortUnsupportedTracedAnalysis Whether this is a fatal error. * @param product The product that the version is unsupported of. * @param version The unsupported version. */ @@ -34,7 +34,7 @@ function handleUnsupportedVersion( logger: Logger, config: ActionConfig<"dbLocation" | "tempDir">, tracedLanguages: string[], - skipUnsupportedTracedAnalysis: boolean, + abortUnsupportedTracedAnalysis: boolean, product: "macOS" | "Xcode", version: semver.SemVer, ) { @@ -63,7 +63,7 @@ function handleUnsupportedVersion( baseMessage, `For more information, see [this announcement](${DocUrl.UNSUPPORTED_TRACED_ANALYSIS_MACOS27}).`, ].join(" "), - severity: skipUnsupportedTracedAnalysis ? "error" : "warning", + severity: abortUnsupportedTracedAnalysis ? "error" : "warning", visibility: { cliSummaryTable: true, statusPage: true, @@ -81,7 +81,7 @@ function handleUnsupportedVersion( ].join(" "); // Throw an error to abort the analysis if the FF is enabled or log the message. - if (skipUnsupportedTracedAnalysis) { + if (abortUnsupportedTracedAnalysis) { throw new ConfigurationError(logMessage); } else { // This will also show up as a workflow annotation. @@ -159,8 +159,8 @@ export async function checkRunnerSupportsTracedAnalysis( return; } - const skipUnsupportedTracedAnalysis = await action.features.getValue( - Feature.SkipUnsupportedTracedAnalysis, + const abortUnsupportedTracedAnalysis = await action.features.getValue( + Feature.AbortUnsupportedTracedAnalysis, ); if (typeof version === "string") { // If we got a string, we are on macOS but couldn't parse the version string. @@ -172,7 +172,7 @@ export async function checkRunnerSupportsTracedAnalysis( action.logger, config, tracedLanguages, - skipUnsupportedTracedAnalysis, + abortUnsupportedTracedAnalysis, "macOS", version, ); @@ -203,7 +203,7 @@ export async function checkRunnerSupportsTracedAnalysis( action.logger, config, tracedLanguages, - skipUnsupportedTracedAnalysis, + abortUnsupportedTracedAnalysis, "Xcode", xcodeVer, );