Fix #60: channels both in action arguments and environment file (#62)

mamba-org · Jun 11, 2022 · 4ec73b7 · 4ec73b7
1 parent de032af
commit 4ec73b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/test_options.yml b/.github/workflows/test_options.yml
@@ -95,13 +95,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
+      matrix:
+        environment-file: [false, environment.yml]
     steps:
       - uses: actions/checkout@v2
 
       - name: install mamba
         uses: ./
         with:
-          environment-file: false
+          environment-file: ${{ matrix.environment-file }}
           environment-name: test-channels
           extra-specs: |
             xtensor

diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/index.js b/index.js
@@ -204,7 +204,10 @@ always_yes: true
 show_channel_urls: true
 channel_priority: strict
 `
-  const channels = inputs.channels + (extraChannels || []).join(', ')
+  const channels =
+    inputs.channels && extraChannels
+      ? inputs.channels + ',' + extraChannels.join(', ')
+      : inputs.channels || extraChannels?.join(', ')
   if (channels) {
     condarcOpts += `channels: [${channels}]`
   }