Merge pull request #53 from goanpeca/fix/missing-name-env

PR: Use default name unless not provided
conda-incubator · Jul 5, 2020 · 89d2ae9 · 89d2ae9
2 parents 03cf563 + 6308a80
commit 89d2ae9
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 4 deletions.
diff --git a/.github/workflows/example-3.yml b/.github/workflows/example-3.yml
@@ -27,3 +27,23 @@ jobs:
           conda info
           conda list
           printenv | sort
+
+
+  example-3-no-name:
+    name: Ex3-no-name Linux
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./
+        with:
+          activate-environment: anaconda-client-env
+          environment-file: etc/example-environment-no-name.yml
+          python-version: 3.8
+          condarc-file: etc/example-condarc.yml
+          auto-activate-base: false
+          auto-update-conda: true
+      - shell: bash -l {0}
+        run: |
+          conda info
+          conda list
+          printenv | sort
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -21947,6 +21947,7 @@ function setupMiniconda(installerUrl, minicondaVersion, architecture, condaVersi
             if (environmentFile) {
                 let environmentYaml;
                 let condaAction;
+                let activateEnvironmentToUse;
                 try {
                     const sourceEnvironmentPath = path.join(process.env["GITHUB_WORKSPACE"] || "", environmentFile);
                     environmentYaml = yield yaml.safeLoad(fs.readFileSync(sourceEnvironmentPath, "utf8"));
@@ -21958,18 +21959,26 @@ function setupMiniconda(installerUrl, minicondaVersion, architecture, condaVersi
                     environmentYaml["name"] !== undefined &&
                     environmentYaml["name"] !== activateEnvironment) {
                     condaAction = "create";
+                    activateEnvironmentToUse = environmentYaml["name"];
                     utils.consoleLog(`Creating conda environment from yaml file...`);
-                    core.warning('The environment name on "environment-file" is not the same as "enviroment-activate"!');
+                    core.warning('The environment name on "environment-file" is not the same as "enviroment-activate", using "environment-file"!');
                 }
                 else if (activateEnvironment &&
                     activateEnvironment === environmentYaml["name"]) {
                     utils.consoleLog(`Updating conda environment from yaml file...`);
                     condaAction = "update";
+                    activateEnvironmentToUse = activateEnvironment;
+                }
+                else if (activateEnvironment && environmentYaml["name"] === undefined) {
+                    core.warning('The environment name on "environment-file" is not defined, using "enviroment-activate"!');
+                    condaAction = "update";
+                    activateEnvironmentToUse = activateEnvironment;
                 }
                 else {
+                    activateEnvironmentToUse = activateEnvironment;
                     condaAction = "create";
                 }
-                result = yield condaCommand(`env ${condaAction} -f ${environmentFile}`, useBundled, useMamba);
+                result = yield condaCommand(`env ${condaAction} --file ${environmentFile} --name ${activateEnvironmentToUse}`, useBundled, useMamba);
                 if (!result.ok)
                     return result;
             }

diff --git a/etc/example-environment-no-name.yml b/etc/example-environment-no-name.yml
@@ -0,0 +1,3 @@
+dependencies:
+  - black
+  - anaconda-client
diff --git a/src/setup.ts b/src/setup.ts
@@ -826,6 +826,7 @@ async function setupMiniconda(
     if (environmentFile) {
       let environmentYaml: TEnvironment;
       let condaAction: string;
+      let activateEnvironmentToUse: string;
       try {
         const sourceEnvironmentPath: string = path.join(
           process.env["GITHUB_WORKSPACE"] || "",
@@ -843,21 +844,30 @@ async function setupMiniconda(
         environmentYaml["name"] !== activateEnvironment
       ) {
         condaAction = "create";
+        activateEnvironmentToUse = environmentYaml["name"];
         utils.consoleLog(`Creating conda environment from yaml file...`);
         core.warning(
-          'The environment name on "environment-file" is not the same as "enviroment-activate"!'
+          'The environment name on "environment-file" is not the same as "enviroment-activate", using "environment-file"!'
         );
       } else if (
         activateEnvironment &&
         activateEnvironment === environmentYaml["name"]
       ) {
         utils.consoleLog(`Updating conda environment from yaml file...`);
         condaAction = "update";
+        activateEnvironmentToUse = activateEnvironment;
+      } else if (activateEnvironment && environmentYaml["name"] === undefined) {
+        core.warning(
+          'The environment name on "environment-file" is not defined, using "enviroment-activate"!'
+        );
+        condaAction = "update";
+        activateEnvironmentToUse = activateEnvironment;
       } else {
+        activateEnvironmentToUse = activateEnvironment;
         condaAction = "create";
       }
       result = await condaCommand(
-        `env ${condaAction} -f ${environmentFile}`,
+        `env ${condaAction} --file ${environmentFile} --name ${activateEnvironmentToUse}`,
         useBundled,
         useMamba
       );