Skip to content

Commit 391a05d

Browse files
committed
Reshuffle loadUserConfig slightly
1 parent fdf46cd commit 391a05d

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

lib/entry-points.js

Lines changed: 4 additions & 2 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: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,8 @@ export async function loadUserConfig(
489489
apiDetails: api.GitHubApiCombinedDetails,
490490
tempDir: string,
491491
): Promise<UserConfig> {
492+
let config: UserConfig;
493+
492494
if (isLocal(configFile)) {
493495
if (configFile !== userConfigFromActionPath(tempDir)) {
494496
// If the config file is not generated by the Action, it should be relative to the workspace.
@@ -503,16 +505,18 @@ export async function loadUserConfig(
503505
const validateConfig = await actionState.features.getValue(
504506
Feature.ValidateDbConfig,
505507
);
506-
return getLocalConfig(actionState.logger, configFile, validateConfig);
508+
config = getLocalConfig(actionState.logger, configFile, validateConfig);
507509
} else {
508510
// Drop the explicit prefix if it is present. Since `REMOTE_PATH_PREFIX` is chosen
509511
// to not conflict with permissible characters in "owner" or "repo" components,
510512
// this does not risk removing valid parts of either component by accident.
511513
if (isExplicitRemotePath(configFile)) {
512514
configFile = configFile.substring(REMOTE_PATH_PREFIX.length);
513515
}
514-
return await getRemoteConfig(actionState, configFile, apiDetails);
516+
config = await getRemoteConfig(actionState, configFile, apiDetails);
515517
}
518+
519+
return config;
516520
}
517521

518522
/**

0 commit comments

Comments
 (0)