diff --git a/lib/entry-points.js b/lib/entry-points.js index de3ea96af..ce8cc6f3c 100644 --- a/lib/entry-points.js +++ b/lib/entry-points.js @@ -172184,9 +172184,9 @@ var featureConfig = { envVar: "CODEQL_ACTION_START_PROXY_USE_FEATURES_RELEASE", minimumVersion: void 0 }, - ["swift_skip_unsupported_traced_analysis" /* SwiftSkipUnsupportedTracedAnalysis */]: { + ["skip_unsupported_traced_analysis" /* SkipUnsupportedTracedAnalysis */]: { defaultValue: false, - envVar: "CODEQL_ACTION_SWIFT_SKIP_UNSUPPORTED_TRACED_ANALYSIS", + envVar: "CODEQL_ACTION_SKIP_UNSUPPORTED_TRACED_ANALYSIS", minimumVersion: void 0 }, ["tools_repository_property" /* ToolsRepositoryProperty */]: { @@ -186267,7 +186267,7 @@ async function isSwiftCompatible(action, config, codeql) { ); } const skipUnsupportedTracedAnalysis = await action.features.getValue( - "swift_skip_unsupported_traced_analysis" /* SwiftSkipUnsupportedTracedAnalysis */ + "skip_unsupported_traced_analysis" /* SkipUnsupportedTracedAnalysis */ ); if (typeof version === "string") { action.logger.warning( diff --git a/src/feature-flags.ts b/src/feature-flags.ts index 1917bcc52..6c6afd9e5 100644 --- a/src/feature-flags.ts +++ b/src/feature-flags.ts @@ -165,8 +165,8 @@ export enum Feature { */ PerLanguageBundles = "per_language_bundles_v2", QaTelemetryEnabled = "qa_telemetry_enabled", - /** Whether we should fail early if we detect that traced Swift analysis is unsupported. */ - SwiftSkipUnsupportedTracedAnalysis = "swift_skip_unsupported_traced_analysis", + /** Whether we should fail early if we detect that traced analysis is unsupported. */ + SkipUnsupportedTracedAnalysis = "skip_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. */ @@ -458,9 +458,9 @@ export const featureConfig = { envVar: "CODEQL_ACTION_START_PROXY_USE_FEATURES_RELEASE", minimumVersion: undefined, }, - [Feature.SwiftSkipUnsupportedTracedAnalysis]: { + [Feature.SkipUnsupportedTracedAnalysis]: { defaultValue: false, - envVar: "CODEQL_ACTION_SWIFT_SKIP_UNSUPPORTED_TRACED_ANALYSIS", + envVar: "CODEQL_ACTION_SKIP_UNSUPPORTED_TRACED_ANALYSIS", minimumVersion: undefined, }, [Feature.ToolsRepositoryProperty]: { diff --git a/src/languages/swift.test.ts b/src/languages/swift.test.ts index ccc47fcc7..d42c45b59 100644 --- a/src/languages/swift.test.ts +++ b/src/languages/swift.test.ts @@ -209,9 +209,7 @@ test.serial( const env = getTestEnv(); env.set(ActionsEnvVars.RUNNER_TEMP, tmpDir); - const features = createFeatures([ - Feature.SwiftSkipUnsupportedTracedAnalysis, - ]); + const features = createFeatures([Feature.SkipUnsupportedTracedAnalysis]); const codeql = await getCodeQLForTesting( "codeql-for-testing", @@ -397,9 +395,7 @@ test.serial( .stub(fs, "readlinkSync") .returns("/Applications/Xcode_27.0.app/Contents/Developer"); - const features = createFeatures([ - Feature.SwiftSkipUnsupportedTracedAnalysis, - ]); + const features = createFeatures([Feature.SkipUnsupportedTracedAnalysis]); const codeql = await getCodeQLForTesting( "codeql-for-testing", diff --git a/src/languages/swift.ts b/src/languages/swift.ts index 1ae37d9dd..42a9b68d4 100644 --- a/src/languages/swift.ts +++ b/src/languages/swift.ts @@ -114,7 +114,7 @@ export async function isSwiftCompatible( } const skipUnsupportedTracedAnalysis = await action.features.getValue( - Feature.SwiftSkipUnsupportedTracedAnalysis, + Feature.SkipUnsupportedTracedAnalysis, ); if (typeof version === "string") { // If we got a string, we are on macOS but couldn't parse the version string.