Skip to content

Commit ed80d6e

Browse files
committed
Overlay: Reorder available disk space check
1 parent 726a2a0 commit ed80d6e

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

lib/init-action.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/config-utils.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,14 @@ export async function getOverlayDatabaseMode(
679679
`Setting overlay database mode to ${overlayDatabaseMode} ` +
680680
"from the CODEQL_OVERLAY_DATABASE_MODE environment variable.",
681681
);
682-
} else {
682+
} else if (
683+
await isOverlayAnalysisFeatureEnabled(
684+
features,
685+
codeql,
686+
languages,
687+
codeScanningConfig,
688+
)
689+
) {
683690
const diskUsage = await checkDiskUsage(logger);
684691
if (
685692
diskUsage === undefined ||
@@ -693,14 +700,7 @@ export async function getOverlayDatabaseMode(
693700
`Setting overlay database mode to ${overlayDatabaseMode} ` +
694701
`due to insufficient disk space (${diskSpaceMb} MB).`,
695702
);
696-
} else if (
697-
await isOverlayAnalysisFeatureEnabled(
698-
features,
699-
codeql,
700-
languages,
701-
codeScanningConfig,
702-
)
703-
) {
703+
} else {
704704
if (isAnalyzingPullRequest()) {
705705
overlayDatabaseMode = OverlayDatabaseMode.Overlay;
706706
useOverlayDatabaseCaching = true;

0 commit comments

Comments
 (0)