From b1dea65f65157dc6e3a2fc5640b22a5e4b76aec5 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 17 Nov 2025 18:22:31 +0000 Subject: [PATCH 1/6] Make `postProcessAndUploadSarif` the default --- lib/analyze-action.js | 92 +++++-------------------------------------- package-lock.json | 11 ------ src/analyze-action.ts | 58 ++++++--------------------- 3 files changed, 20 insertions(+), 141 deletions(-) diff --git a/lib/analyze-action.js b/lib/analyze-action.js index d89242d02..f96f0c794 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -93378,23 +93378,6 @@ function findSarifFilesInDir(sarifPath, isSarif) { walkSarifFiles(sarifPath); return sarifFiles; } -function getSarifFilePaths(sarifPath, isSarif) { - if (!fs15.existsSync(sarifPath)) { - throw new ConfigurationError(`Path does not exist: ${sarifPath}`); - } - let sarifFiles; - if (fs15.lstatSync(sarifPath).isDirectory()) { - sarifFiles = findSarifFilesInDir(sarifPath, isSarif); - if (sarifFiles.length === 0) { - throw new ConfigurationError( - `No SARIF files found to upload in "${sarifPath}".` - ); - } - } else { - sarifFiles = [sarifPath]; - } - return sarifFiles; -} async function getGroupedSarifFilePaths(logger, sarifPath) { const stats = fs15.statSync(sarifPath, { throwIfNoEntry: false }); if (stats === void 0) { @@ -93585,36 +93568,6 @@ async function writePostProcessedFiles(logger, pathInput, uploadTarget, postProc logger.debug(`Not writing post-processed SARIF files.`); } } -async function uploadFiles(inputSarifPath, checkoutPath, category, features, logger, uploadTarget) { - const sarifPaths = getSarifFilePaths( - inputSarifPath, - uploadTarget.sarifPredicate - ); - return uploadSpecifiedFiles( - sarifPaths, - checkoutPath, - category, - features, - logger, - uploadTarget - ); -} -async function uploadSpecifiedFiles(sarifPaths, checkoutPath, category, features, logger, uploadTarget) { - const processingResults = await postProcessSarifFiles( - logger, - features, - checkoutPath, - sarifPaths, - category, - uploadTarget - ); - return uploadPostProcessedFiles( - logger, - checkoutPath, - uploadTarget, - processingResults - ); -} async function uploadPostProcessedFiles(logger, checkoutPath, uploadTarget, postProcessingResults) { logger.startGroup(`Uploading ${uploadTarget.name} results`); const sarif = postProcessingResults.sarif; @@ -94070,42 +94023,15 @@ async function run() { if (runStats) { const checkoutPath = getRequiredInput("checkout_path"); const category = getOptionalInput("category"); - if (await features.getValue("analyze_use_new_upload" /* AnalyzeUseNewUpload */)) { - uploadResults = await postProcessAndUploadSarif( - logger, - features, - uploadKind, - checkoutPath, - outputDir, - category, - getOptionalInput("post-processed-sarif-path") - ); - } else if (uploadKind === "always") { - uploadResults = {}; - if (isCodeScanningEnabled(config)) { - uploadResults["code-scanning" /* CodeScanning */] = await uploadFiles( - outputDir, - checkoutPath, - category, - features, - logger, - CodeScanning - ); - } - if (isCodeQualityEnabled(config)) { - uploadResults["code-quality" /* CodeQuality */] = await uploadFiles( - outputDir, - checkoutPath, - category, - features, - logger, - CodeQuality - ); - } - } else { - uploadResults = {}; - logger.info("Not uploading results"); - } + uploadResults = await postProcessAndUploadSarif( + logger, + features, + uploadKind, + checkoutPath, + outputDir, + category, + getOptionalInput("post-processed-sarif-path") + ); if (uploadResults["code-scanning" /* CodeScanning */] !== void 0) { core14.setOutput( "sarif-id", diff --git a/package-lock.json b/package-lock.json index edf6f50e3..2631ab050 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1799,7 +1799,6 @@ "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.2.tgz", "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==", "license": "MIT", - "peer": true, "dependencies": { "@octokit/auth-token": "^4.0.0", "@octokit/graphql": "^7.1.0", @@ -2569,7 +2568,6 @@ "integrity": "sha512-jCzKdm/QK0Kg4V4IK/oMlRZlY+QOcdjv89U2NgKHZk1CYTj82/RVSx1mV/0gqCVMJ/DA+Zf/S4NBWNF8GQ+eqQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.48.0", "@typescript-eslint/types": "8.48.0", @@ -3164,7 +3162,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3740,7 +3737,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001669", "electron-to-chromium": "^1.5.41", @@ -4594,7 +4590,6 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "dev": true, - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -4649,7 +4644,6 @@ "version": "8.3.0", "dev": true, "license": "MIT", - "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -4921,7 +4915,6 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, - "peer": true, "dependencies": { "array-includes": "^3.1.7", "array.prototype.findlastindex": "^1.2.3", @@ -7357,7 +7350,6 @@ "integrity": "sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==", "dev": true, "license": "MIT", - "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -8351,7 +8343,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -8560,7 +8551,6 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -8634,7 +8624,6 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.17.0.tgz", "integrity": "sha512-Drp39TXuUlD49F7ilHHCG7TTg8IkA+hxCuULdmzWYICxGXvDXmDmWEjJYZQYgf6l/TFfYNE167m7isnc3xlIEg==", "dev": true, - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.17.0", "@typescript-eslint/types": "8.17.0", diff --git a/src/analyze-action.ts b/src/analyze-action.ts index f89eed7d1..c6a3d7dc2 100644 --- a/src/analyze-action.ts +++ b/src/analyze-action.ts @@ -19,12 +19,7 @@ import { getApiDetails, getGitHubVersion } from "./api-client"; import { runAutobuild } from "./autobuild"; import { getTotalCacheSize, shouldStoreCache } from "./caching-utils"; import { getCodeQL } from "./codeql"; -import { - Config, - getConfig, - isCodeQualityEnabled, - isCodeScanningEnabled, -} from "./config-utils"; +import { Config, getConfig } from "./config-utils"; import { cleanupAndUploadDatabases } from "./database-upload"; import { DependencyCacheUploadStatusReport, @@ -32,7 +27,7 @@ import { } from "./dependency-caching"; import { getDiffInformedAnalysisBranches } from "./diff-informed-analysis-utils"; import { EnvVar } from "./environment"; -import { Feature, Features } from "./feature-flags"; +import { Features } from "./feature-flags"; import { KnownLanguage } from "./languages"; import { getActionsLogger, Logger } from "./logging"; import { cleanupAndUploadOverlayBaseDatabaseToCache } from "./overlay-database-utils"; @@ -358,46 +353,15 @@ async function run() { const checkoutPath = actionsUtil.getRequiredInput("checkout_path"); const category = actionsUtil.getOptionalInput("category"); - if (await features.getValue(Feature.AnalyzeUseNewUpload)) { - uploadResults = await postProcessAndUploadSarif( - logger, - features, - uploadKind, - checkoutPath, - outputDir, - category, - actionsUtil.getOptionalInput("post-processed-sarif-path"), - ); - } else if (uploadKind === "always") { - uploadResults = {}; - - if (isCodeScanningEnabled(config)) { - uploadResults[analyses.AnalysisKind.CodeScanning] = - await uploadLib.uploadFiles( - outputDir, - checkoutPath, - category, - features, - logger, - analyses.CodeScanning, - ); - } - - if (isCodeQualityEnabled(config)) { - uploadResults[analyses.AnalysisKind.CodeQuality] = - await uploadLib.uploadFiles( - outputDir, - checkoutPath, - category, - features, - logger, - analyses.CodeQuality, - ); - } - } else { - uploadResults = {}; - logger.info("Not uploading results"); - } + uploadResults = await postProcessAndUploadSarif( + logger, + features, + uploadKind, + checkoutPath, + outputDir, + category, + actionsUtil.getOptionalInput("post-processed-sarif-path"), + ); // Set the SARIF id outputs only if we have results for them, to avoid // having keys with empty values in the action output. From 009fe6b0c133b5ad480114ae2bed9989b7dd20df Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Mon, 17 Nov 2025 18:23:53 +0000 Subject: [PATCH 2/6] Remove `AnalyzeUseNewUpload` FF --- lib/analyze-action-post.js | 5 ----- lib/analyze-action.js | 5 ----- lib/autobuild-action.js | 5 ----- lib/init-action-post.js | 5 ----- lib/init-action.js | 5 ----- lib/resolve-environment-action.js | 5 ----- lib/setup-codeql-action.js | 5 ----- lib/start-proxy-action-post.js | 5 ----- lib/start-proxy-action.js | 5 ----- lib/upload-lib.js | 5 ----- lib/upload-sarif-action-post.js | 5 ----- lib/upload-sarif-action.js | 5 ----- src/feature-flags.ts | 6 ------ 13 files changed, 66 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index f1d6b1faf..b817dc5af 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -120022,11 +120022,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/analyze-action.js b/lib/analyze-action.js index f96f0c794..7ca97a7d6 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -88661,11 +88661,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index b4159bf59..e0bda195a 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -83962,11 +83962,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 1ba036897..8539e873f 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -123403,11 +123403,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/init-action.js b/lib/init-action.js index b78367b7d..70be3672b 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -86075,11 +86075,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 2fdbc539a..47e9831de 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -83953,11 +83953,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 22a8402bf..8c89cdd74 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -83865,11 +83865,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index 54fb9a5eb..736dd9760 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -119428,11 +119428,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index 2ac031a11..4653613c9 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -100017,11 +100017,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 3da4b62f7..d7fa8ac1c 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -87018,11 +87018,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 4570960d4..f09475c0f 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -119594,11 +119594,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 47a0cfd4e..de9e2c2a1 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -86815,11 +86815,6 @@ var featureConfig = { envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: void 0 }, - ["analyze_use_new_upload" /* AnalyzeUseNewUpload */]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: void 0 - }, ["cleanup_trap_caches" /* CleanupTrapCaches */]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", diff --git a/src/feature-flags.ts b/src/feature-flags.ts index 999ed20d7..59f1c4869 100644 --- a/src/feature-flags.ts +++ b/src/feature-flags.ts @@ -44,7 +44,6 @@ export interface FeatureEnablement { */ export enum Feature { AllowToolcacheInput = "allow_toolcache_input", - AnalyzeUseNewUpload = "analyze_use_new_upload", CleanupTrapCaches = "cleanup_trap_caches", CppDependencyInstallation = "cpp_dependency_installation_enabled", CsharpCacheBuildModeNone = "csharp_cache_bmn", @@ -120,11 +119,6 @@ export const featureConfig: Record< envVar: "CODEQL_ACTION_ALLOW_TOOLCACHE_INPUT", minimumVersion: undefined, }, - [Feature.AnalyzeUseNewUpload]: { - defaultValue: false, - envVar: "CODEQL_ACTION_ANALYZE_USE_NEW_UPLOAD", - minimumVersion: undefined, - }, [Feature.CleanupTrapCaches]: { defaultValue: false, envVar: "CODEQL_ACTION_CLEANUP_TRAP_CACHES", From a539068a614d4522def461f9854735660972c07c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 17:18:28 +0000 Subject: [PATCH 3/6] Bump ruby/setup-ruby Bumps the actions-minor group with 1 update in the /.github/workflows directory: [ruby/setup-ruby](https://github.com/ruby/setup-ruby). Updates `ruby/setup-ruby` from 1.269.0 to 1.270.0 - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb) - [Commits](https://github.com/ruby/setup-ruby/compare/d697be2f83c6234b20877c3b5eac7a7f342f0d0c...ac793fdd38cc468a4dd57246fa9d0e868aba9085) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-version: 1.270.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/__rubocop-multi-language.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/__rubocop-multi-language.yml b/.github/workflows/__rubocop-multi-language.yml index b684ce4e4..9b814f8d3 100644 --- a/.github/workflows/__rubocop-multi-language.yml +++ b/.github/workflows/__rubocop-multi-language.yml @@ -56,7 +56,7 @@ jobs: use-all-platform-bundle: 'false' setup-kotlin: 'true' - name: Set up Ruby - uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0 + uses: ruby/setup-ruby@ac793fdd38cc468a4dd57246fa9d0e868aba9085 # v1.270.0 with: ruby-version: 2.6 - name: Install Code Scanning integration From 034374eb3f10ed29de5692a79ffbe5207bb9a498 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 17:18:40 +0000 Subject: [PATCH 4/6] Bump actions/upload-artifact from 5 to 6 in /.github/workflows Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/__bundle-zstd.yml | 2 +- .github/workflows/__config-export.yml | 2 +- .github/workflows/__diagnostics-export.yml | 2 +- .github/workflows/__export-file-baseline-information.yml | 2 +- .github/workflows/__job-run-uuid-sarif.yml | 2 +- .github/workflows/__quality-queries.yml | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/__bundle-zstd.yml b/.github/workflows/__bundle-zstd.yml index 18185ada3..1d0d9b47e 100644 --- a/.github/workflows/__bundle-zstd.yml +++ b/.github/workflows/__bundle-zstd.yml @@ -79,7 +79,7 @@ jobs: output: ${{ runner.temp }}/results upload-database: false - name: Upload SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: ${{ matrix.os }}-zstd-bundle.sarif path: ${{ runner.temp }}/results/javascript.sarif diff --git a/.github/workflows/__config-export.yml b/.github/workflows/__config-export.yml index 1c9895854..1a2df7875 100644 --- a/.github/workflows/__config-export.yml +++ b/.github/workflows/__config-export.yml @@ -67,7 +67,7 @@ jobs: output: ${{ runner.temp }}/results upload-database: false - name: Upload SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: config-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json path: ${{ runner.temp }}/results/javascript.sarif diff --git a/.github/workflows/__diagnostics-export.yml b/.github/workflows/__diagnostics-export.yml index 8c05b6d92..b0265ca3f 100644 --- a/.github/workflows/__diagnostics-export.yml +++ b/.github/workflows/__diagnostics-export.yml @@ -78,7 +78,7 @@ jobs: output: ${{ runner.temp }}/results upload-database: false - name: Upload SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: diagnostics-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json path: ${{ runner.temp }}/results/javascript.sarif diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml index 7ebf51f3f..2a4556ddf 100644 --- a/.github/workflows/__export-file-baseline-information.yml +++ b/.github/workflows/__export-file-baseline-information.yml @@ -99,7 +99,7 @@ jobs: with: output: ${{ runner.temp }}/results - name: Upload SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: with-baseline-information-${{ matrix.os }}-${{ matrix.version }}.sarif.json path: ${{ runner.temp }}/results/javascript.sarif diff --git a/.github/workflows/__job-run-uuid-sarif.yml b/.github/workflows/__job-run-uuid-sarif.yml index 73cb295fe..6fc005268 100644 --- a/.github/workflows/__job-run-uuid-sarif.yml +++ b/.github/workflows/__job-run-uuid-sarif.yml @@ -64,7 +64,7 @@ jobs: with: output: ${{ runner.temp }}/results - name: Upload SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: ${{ matrix.os }}-${{ matrix.version }}.sarif.json path: ${{ runner.temp }}/results/javascript.sarif diff --git a/.github/workflows/__quality-queries.yml b/.github/workflows/__quality-queries.yml index caef10d27..66184f9c2 100644 --- a/.github/workflows/__quality-queries.yml +++ b/.github/workflows/__quality-queries.yml @@ -83,7 +83,7 @@ jobs: post-processed-sarif-path: ${{ runner.temp }}/post-processed - name: Upload security SARIF if: contains(matrix.analysis-kinds, 'code-scanning') - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: | quality-queries-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.analysis-kinds }}.sarif.json @@ -91,14 +91,14 @@ jobs: retention-days: 7 - name: Upload quality SARIF if: contains(matrix.analysis-kinds, 'code-quality') - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: | quality-queries-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.analysis-kinds }}.quality.sarif.json path: ${{ runner.temp }}/results/javascript.quality.sarif retention-days: 7 - name: Upload post-processed SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: | post-processed-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.analysis-kinds }}.sarif.json From d6c1a791b769174c32486b028f2780d27c7aa5b7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 17:20:02 +0000 Subject: [PATCH 5/6] Rebuild --- pr-checks/checks/rubocop-multi-language.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr-checks/checks/rubocop-multi-language.yml b/pr-checks/checks/rubocop-multi-language.yml index b919b5675..b81e74331 100644 --- a/pr-checks/checks/rubocop-multi-language.yml +++ b/pr-checks/checks/rubocop-multi-language.yml @@ -4,7 +4,7 @@ description: "Tests using RuboCop to analyze a multi-language repository and the versions: ["default"] steps: - name: Set up Ruby - uses: ruby/setup-ruby@d697be2f83c6234b20877c3b5eac7a7f342f0d0c # v1.269.0 + uses: ruby/setup-ruby@ac793fdd38cc468a4dd57246fa9d0e868aba9085 # v1.270.0 with: ruby-version: 2.6 - name: Install Code Scanning integration From 7fd7db3f267bcd2a7defe5ffc6f223e9d730d773 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 17:20:17 +0000 Subject: [PATCH 6/6] Rebuild --- pr-checks/checks/bundle-zstd.yml | 2 +- pr-checks/checks/config-export.yml | 2 +- pr-checks/checks/diagnostics-export.yml | 2 +- pr-checks/checks/export-file-baseline-information.yml | 2 +- pr-checks/checks/job-run-uuid-sarif.yml | 2 +- pr-checks/checks/quality-queries.yml | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pr-checks/checks/bundle-zstd.yml b/pr-checks/checks/bundle-zstd.yml index ac543d824..371525aab 100644 --- a/pr-checks/checks/bundle-zstd.yml +++ b/pr-checks/checks/bundle-zstd.yml @@ -27,7 +27,7 @@ steps: output: ${{ runner.temp }}/results upload-database: false - name: Upload SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: ${{ matrix.os }}-zstd-bundle.sarif path: ${{ runner.temp }}/results/javascript.sarif diff --git a/pr-checks/checks/config-export.yml b/pr-checks/checks/config-export.yml index f7c24f815..fc4c68ad6 100644 --- a/pr-checks/checks/config-export.yml +++ b/pr-checks/checks/config-export.yml @@ -12,7 +12,7 @@ steps: output: "${{ runner.temp }}/results" upload-database: false - name: Upload SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: config-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json path: "${{ runner.temp }}/results/javascript.sarif" diff --git a/pr-checks/checks/diagnostics-export.yml b/pr-checks/checks/diagnostics-export.yml index b0ea306fb..ccf5b3501 100644 --- a/pr-checks/checks/diagnostics-export.yml +++ b/pr-checks/checks/diagnostics-export.yml @@ -25,7 +25,7 @@ steps: output: "${{ runner.temp }}/results" upload-database: false - name: Upload SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: diagnostics-export-${{ matrix.os }}-${{ matrix.version }}.sarif.json path: "${{ runner.temp }}/results/javascript.sarif" diff --git a/pr-checks/checks/export-file-baseline-information.yml b/pr-checks/checks/export-file-baseline-information.yml index 5ff186e9f..fdc352285 100644 --- a/pr-checks/checks/export-file-baseline-information.yml +++ b/pr-checks/checks/export-file-baseline-information.yml @@ -18,7 +18,7 @@ steps: with: output: "${{ runner.temp }}/results" - name: Upload SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: with-baseline-information-${{ matrix.os }}-${{ matrix.version }}.sarif.json path: "${{ runner.temp }}/results/javascript.sarif" diff --git a/pr-checks/checks/job-run-uuid-sarif.yml b/pr-checks/checks/job-run-uuid-sarif.yml index 751ac4e1e..e0610846b 100644 --- a/pr-checks/checks/job-run-uuid-sarif.yml +++ b/pr-checks/checks/job-run-uuid-sarif.yml @@ -11,7 +11,7 @@ steps: with: output: "${{ runner.temp }}/results" - name: Upload SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: ${{ matrix.os }}-${{ matrix.version }}.sarif.json path: "${{ runner.temp }}/results/javascript.sarif" diff --git a/pr-checks/checks/quality-queries.yml b/pr-checks/checks/quality-queries.yml index 4fb983745..353abbb77 100644 --- a/pr-checks/checks/quality-queries.yml +++ b/pr-checks/checks/quality-queries.yml @@ -39,7 +39,7 @@ steps: post-processed-sarif-path: "${{ runner.temp }}/post-processed" - name: Upload security SARIF if: contains(matrix.analysis-kinds, 'code-scanning') - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: | quality-queries-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.analysis-kinds }}.sarif.json @@ -47,14 +47,14 @@ steps: retention-days: 7 - name: Upload quality SARIF if: contains(matrix.analysis-kinds, 'code-quality') - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: | quality-queries-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.analysis-kinds }}.quality.sarif.json path: "${{ runner.temp }}/results/javascript.quality.sarif" retention-days: 7 - name: Upload post-processed SARIF - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: | post-processed-${{ matrix.os }}-${{ matrix.version }}-${{ matrix.analysis-kinds }}.sarif.json