Test

conda-incubator · Mar 19, 2020 · 24caea9 · 24caea9
1 parent 8b5066c
commit 24caea9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -32861,6 +32861,16 @@ function setupMiniconda(minicondaVersion, architecture, condaVersion, condaBuild
             }
             consoleLog("Setup environment variables...");
             result = yield setVariables(useBundled);
+            if (!result["ok"])
+                return result;
+            if (condaConfig) {
+                consoleLog("Applying conda configuration...");
+                result = yield applyCondaConfiguration(condaConfig, useBundled);
+                if (!result["ok"])
+                    return result;
+            }
+            consoleLog("Setup Conda basic configuration...");
+            result = yield condaCommand("config --set always_yes yes --set changeps1 no", useBundled);
             if (!result["ok"])
                 return result;
             if (condaVersion) {
@@ -32891,16 +32901,6 @@ function setupMiniconda(minicondaVersion, architecture, condaVersion, condaBuild
                     return { ok: false, error: err };
                 }
             }
-            if (condaConfig) {
-                consoleLog("Applying conda configuration...");
-                result = yield applyCondaConfiguration(condaConfig, useBundled);
-                if (!result["ok"])
-                    return result;
-            }
-            consoleLog("Setup Conda basic configuration...");
-            result = yield condaCommand("config --set always_yes yes --set changeps1 no", useBundled);
-            if (!result["ok"])
-                return result;
             // Any conda commands run here after init and setup
             if (condaBuildVersion) {
                 consoleLog("Installing Conda Build...");

diff --git a/src/setup-conda.ts b/src/setup-conda.ts
@@ -606,6 +606,19 @@ async function setupMiniconda(
     result = await setVariables(useBundled);
     if (!result["ok"]) return result;
 
+    if (condaConfig) {
+      consoleLog("Applying conda configuration...");
+      result = await applyCondaConfiguration(condaConfig, useBundled);
+      if (!result["ok"]) return result;
+    }
+
+    consoleLog("Setup Conda basic configuration...");
+    result = await condaCommand(
+      "config --set always_yes yes --set changeps1 no",
+      useBundled
+    );
+    if (!result["ok"]) return result;
+
     if (condaVersion) {
       consoleLog("Installing Conda...");
       result = await condaCommand(
@@ -645,19 +658,6 @@ async function setupMiniconda(
       }
     }
 
-    if (condaConfig) {
-      consoleLog("Applying conda configuration...");
-      result = await applyCondaConfiguration(condaConfig, useBundled);
-      if (!result["ok"]) return result;
-    }
-
-    consoleLog("Setup Conda basic configuration...");
-    result = await condaCommand(
-      "config --set always_yes yes --set changeps1 no",
-      useBundled
-    );
-    if (!result["ok"]) return result;
-
     // Any conda commands run here after init and setup
     if (condaBuildVersion) {
       consoleLog("Installing Conda Build...");