Test

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

Hide file tree

Showing 3 changed files with 41 additions and 40 deletions.
diff --git a/.github/workflows/example-4.yml b/.github/workflows/example-4.yml
@@ -23,4 +23,5 @@ jobs:
         run: |
           conda info
           conda list
-          conda config --describe channel_priority
+          conda config --show-sources
+          conda config --show
diff --git a/dist/index.js b/dist/index.js
@@ -32863,6 +32863,18 @@ function setupMiniconda(minicondaVersion, architecture, condaVersion, condaBuild
             result = yield setVariables(useBundled);
             if (!result["ok"])
                 return result;
+            if (condaVersion) {
+                consoleLog("Installing Conda...");
+                result = yield condaCommand(`install --name base conda=${condaVersion} --quiet`, useBundled);
+                if (!result["ok"])
+                    return result;
+            }
+            if (condaConfig["auto_update_conda"] == "true") {
+                consoleLog("Updating conda...");
+                result = yield condaCommand("update conda --quiet", useBundled);
+                if (!result["ok"])
+                    return result;
+            }
             consoleLog("Initialize Conda...");
             result = yield condaInit(activateEnvironment, useBundled, condaConfig, removeProfiles);
             if (!result["ok"])
@@ -32879,23 +32891,17 @@ 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 (condaVersion) {
-                consoleLog("Installing Conda...");
-                result = yield condaCommand(`install --name base conda=${condaVersion} --quiet`, useBundled);
-                if (!result["ok"])
-                    return result;
-            }
-            if (condaConfig["auto_update_conda"] == "true") {
-                consoleLog("Updating conda...");
-                result = yield condaCommand("update conda --quiet", useBundled);
-                if (!result["ok"])
-                    return result;
-            }
             if (condaBuildVersion) {
                 consoleLog("Installing Conda Build...");
                 result = yield condaCommand(`install --name base conda-build=${condaBuildVersion} --quiet`, useBundled);
@@ -32942,12 +32948,6 @@ function setupMiniconda(minicondaVersion, architecture, condaVersion, condaBuild
                 if (!result["ok"])
                     return result;
             }
-            if (condaConfig) {
-                consoleLog("Applying conda configuration...");
-                result = yield applyCondaConfiguration(condaConfig, useBundled);
-                if (!result["ok"])
-                    return result;
-            }
         }
         catch (err) {
             return { ok: false, error: err };

diff --git a/src/setup-conda.ts b/src/setup-conda.ts
@@ -606,6 +606,21 @@ async function setupMiniconda(
     result = await setVariables(useBundled);
     if (!result["ok"]) return result;
 
+    if (condaVersion) {
+      consoleLog("Installing Conda...");
+      result = await condaCommand(
+        `install --name base conda=${condaVersion} --quiet`,
+        useBundled
+      );
+      if (!result["ok"]) return result;
+    }
+
+    if (condaConfig["auto_update_conda"] == "true") {
+      consoleLog("Updating conda...");
+      result = await condaCommand("update conda --quiet", useBundled);
+      if (!result["ok"]) return result;
+    }
+
     consoleLog("Initialize Conda...");
     result = await condaInit(
       activateEnvironment,
@@ -630,6 +645,12 @@ 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",
@@ -638,21 +659,6 @@ async function setupMiniconda(
     if (!result["ok"]) return result;
 
     // Any conda commands run here after init and setup
-    if (condaVersion) {
-      consoleLog("Installing Conda...");
-      result = await condaCommand(
-        `install --name base conda=${condaVersion} --quiet`,
-        useBundled
-      );
-      if (!result["ok"]) return result;
-    }
-
-    if (condaConfig["auto_update_conda"] == "true") {
-      consoleLog("Updating conda...");
-      result = await condaCommand("update conda --quiet", useBundled);
-      if (!result["ok"]) return result;
-    }
-
     if (condaBuildVersion) {
       consoleLog("Installing Conda Build...");
       result = await condaCommand(
@@ -718,12 +724,6 @@ async function setupMiniconda(
       );
       if (!result["ok"]) return result;
     }
-
-    if (condaConfig) {
-      consoleLog("Applying conda configuration...");
-      result = await applyCondaConfiguration(condaConfig, useBundled);
-      if (!result["ok"]) return result;
-    }
   } catch (err) {
     return { ok: false, error: err };
   }