fix: options overrides ci

argos-ci · Jan 4, 2023 · 047d865 · 047d865
1 parent 760abb1
commit 047d865
Showing 1 changed file with 26 additions and 30 deletions.
diff --git a/packages/core/src/upload.ts b/packages/core/src/upload.ts
@@ -39,42 +39,38 @@ export interface UploadParameters {
 }
 
 const getConfigFromOptions = (options: UploadParameters) => {
-  const { apiBaseUrl, commit, branch, token, buildName, parallel, prNumber } =
-    options;
-
   const config = createConfig();
+
+  const ciEnv = getCiEnvironment();
+  if (ciEnv) {
+    config.load(
+      omitUndefined({
+        commit: ciEnv.commit,
+        branch: ciEnv.branch,
+        ciService: ciEnv.name,
+        owner: ciEnv.owner,
+        repository: ciEnv.repository,
+        jobId: ciEnv.jobId,
+        runId: ciEnv.runId,
+        prNumber: ciEnv.prNumber,
+      })
+    );
+  }
+
   config.load(
     omitUndefined({
-      apiBaseUrl,
-      commit,
-      branch,
-      token,
-      prNumber,
-      buildName,
-      parallel: Boolean(parallel),
-      parallelNonce: parallel ? parallel.nonce : null,
-      parallelTotal: parallel ? parallel.total : null,
+      apiBaseUrl: options.apiBaseUrl,
+      commit: options.commit,
+      branch: options.branch,
+      token: options.token,
+      prNumber: options.prNumber,
+      buildName: options.buildName,
+      parallel: Boolean(options.parallel),
+      parallelNonce: options.parallel ? options.parallel.nonce : null,
+      parallelTotal: options.parallel ? options.parallel.total : null,
     })
   );
 
-  if (!config.get("commit")) {
-    const ciEnv = getCiEnvironment();
-    if (ciEnv) {
-      config.load(
-        omitUndefined({
-          commit: ciEnv.commit,
-          branch: ciEnv.branch,
-          ciService: ciEnv.name,
-          owner: ciEnv.owner,
-          repository: ciEnv.repository,
-          jobId: ciEnv.jobId,
-          runId: ciEnv.runId,
-          prNumber: ciEnv.prNumber,
-        })
-      );
-    }
-  }
-
   config.validate();
 
   return config.get();