Skip to content

Refactor: prepare debug artifacts for artifact upgrades #2475

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.

Sign up for GitHub

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
angelapwen merged 8 commits into from
Sep 13, 2024
Merged

Refactor: prepare debug artifacts for artifact upgrades #2475

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b296f26
Refactor: upload all available debug artifacts in init-post
angelapwen Sep 11, 2024
c098b25
Only upload `upload-sarif` debug artifacts at most once
angelapwen Sep 11, 2024
4ba2440
Rebuild: add transpiled files
angelapwen Sep 11, 2024
82ce313
Remove unused helper file
angelapwen Sep 11, 2024
d4bfd40
Use `.push` rather than `.concat`
angelapwen Sep 11, 2024
cb7faf5
Refactor: move combined SARIF debug artifact logic to `debug-artifact`
angelapwen Sep 12, 2024
e771680
Rename `upload-debug-artifacts` to `combined-sarif-artifacts`
angelapwen Sep 12, 2024
bc660fc
Copy SARIF file to database location rather than move
angelapwen Sep 12, 2024
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
Prev Previous commit
Next Next commit
Use .push rather than .concat
  • Loading branch information
@angelapwen
angelapwen committed Sep 11, 2024
commit d4bfd4051319fc1685629e50c0cd9647dc4cf26c
10 changes: 5 additions & 5 deletions lib/debug-artifacts.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion lib/debug-artifacts.js.map
View file
Open in desktop

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

12 changes: 5 additions & 7 deletions src/debug-artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export async function uploadAllAvailableDebugArtifacts(
config: Config,
logger: Logger,
) {
let filesToUpload: string[] = [];
const filesToUpload: string[] = [];

const analyzeActionOutputDir = process.env[EnvVar.SARIF_RESULTS_OUTPUT_DIR];
for (const lang of config.languages) {
Expand All @@ -46,15 +46,15 @@ export async function uploadAllAvailableDebugArtifacts(
`${lang}.sarif`,
);
fs.renameSync(sarifFile, sarifInDbLocation);
Comment thread
henrymercer marked this conversation as resolved.
Outdated
filesToUpload = filesToUpload.concat(sarifInDbLocation);
filesToUpload.push(sarifInDbLocation);
}
}

// Add any log files
const databaseDirectory = getCodeQLDatabasePath(config, lang);
const logsDirectory = path.resolve(databaseDirectory, "log");
if (doesDirectoryExist(logsDirectory)) {
filesToUpload = filesToUpload.concat(listFolder(logsDirectory));
filesToUpload.push(...listFolder(logsDirectory));
}

// Multilanguage tracing: there are additional logs in the root of the cluster
Expand All @@ -63,9 +63,7 @@ export async function uploadAllAvailableDebugArtifacts(
"log",
);
if (doesDirectoryExist(multiLanguageTracingLogsDirectory)) {
filesToUpload = filesToUpload.concat(
listFolder(multiLanguageTracingLogsDirectory),
);
filesToUpload.push(...listFolder(multiLanguageTracingLogsDirectory));
}

// Add database bundle
Expand All @@ -75,7 +73,7 @@ export async function uploadAllAvailableDebugArtifacts(
} else {
databaseBundlePath = await createDatabaseBundleCli(config, lang);
}
filesToUpload = filesToUpload.concat(databaseBundlePath);
filesToUpload.push(databaseBundlePath);
}

await uploadDebugArtifacts(
Expand Down