chore: test synchronous retrieval of configurations

ubiquity-os · Jan 16, 2025 · ce182da · ce182da
1 parent a3820fa
commit ce182da
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/github/utils/config.ts b/src/github/utils/config.ts
@@ -74,18 +74,17 @@ export async function getConfig(context: GitHubContext): Promise<PluginConfigura
   console.log(
     `Will fetch configuration from ${payload.repository.owner.login}/${CONFIG_ORG_REPO}, ${payload.repository.owner.login}/${payload.repository.name}`
   );
-  const configurations = await Promise.all([
-    getConfigurationFromRepo(context, CONFIG_ORG_REPO, payload.repository.owner.login),
-    getConfigurationFromRepo(context, payload.repository.name, payload.repository.owner.login),
-  ]);
+  const orgConfig = await getConfigurationFromRepo(context, CONFIG_ORG_REPO, payload.repository.owner.login);
+  const repoConfig = await getConfigurationFromRepo(context, payload.repository.name, payload.repository.owner.login);
 
   console.log(`Done fetching configurations for ${payload.repository.owner.login}/${payload.repository.name}, will merge them.`);
 
-  configurations.forEach((configuration) => {
-    if (configuration.config) {
-      mergedConfiguration = mergeConfigurations(mergedConfiguration, configuration.config);
-    }
-  });
+  if (orgConfig.config) {
+    mergedConfiguration = mergeConfigurations(mergedConfiguration, orgConfig.config);
+  }
+  if (repoConfig.config) {
+    mergedConfiguration = mergeConfigurations(mergedConfiguration, repoConfig.config);
+  }
 
   console.log(`Will check plugin chains for ${payload.repository.owner.login}/${payload.repository.name}.`);