Add 'channels' option

.github/workflows/options.yml

@@ -21,6 +21,7 @@ jobs:
         uses: ./
         with:
           environment-file: false
+          environment-name: nofile
 
       - name: install mamba
         uses: ./
@@ -88,3 +89,20 @@ jobs:
           pytest --version
           python -c "import pytest; assert pytest.__version__.startswith(str(${{ matrix.pytest }}))"
         if: runner.os != 'Windows'
+
+  test_channels:
+    name: Test channels
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: install mamba
+        uses: ./
+        with:
+          environment-file: false
+          environment-name: test-channels
+          extra-specs: |
+            xtensor
+          channels: conda-forge,blah

README.md

@@ -10,7 +10,7 @@ GitHub Action to provision a CI instance using micromamba.
 
 ### `environment-file`
 
-The environment.yml or .lock file for the conda environment. If 'false', no enviroment will be created (only Micromamba will be installed).
+The environment.yml or .lock file for the conda environment. If 'false', no enviroment will be created (only Micromamba will be installed) and you should provide 'channels'.
 
 ### `environment-name`
 
@@ -24,6 +24,10 @@ The environment.yml or .lock file for the conda environment. If 'false', no envi
 
 (Optional) Additional specifications (packages) to install. Pretty useful when using matrix builds to pin versions of a test/run dependency. For multiple packages, use multiline syntax (see examples). Note that selectors (e.g. `sel(linux): my-linux-package`, `sel(osx): my-osx-package`, `sel(win): my-win-package`) are available.
 
+### `channels`
+
+(Optional) Comma separated list of channels to use in order of priority (eg., `conda-forge,my-private-channel`)
+
 ### `cache-downloads`
 
 (Optional) If 'true', cache downloaded packages across calls to the provision-with-micromamba action. Cache invalidation can be controlled using the 'cache-downloads-key' option.

action.yml

@@ -7,7 +7,8 @@ inputs:
   environment-file:
     description: >-
       The environment.yml or .lock file for the conda environment.
-      If 'false', no enviroment will be created (only Micromamba will be installed).
+      If 'false', no enviroment will be created (only Micromamba will be installed)
+      and you should provide 'channels'.
     required: true
     default: environment.yml
   environment-name:
@@ -30,6 +31,11 @@ inputs:
       are available.
     required: false
     default: ""
+  channels:
+    description: >-
+      Comma separated list of channels to use in order of priority (eg., `conda-forge,my-private-channel`)
+    required: false
+    default: ""
   cache-downloads:
     description: >-
       If 'true', cache downloaded packages across calls to the provision-with-micromamba action.

index.js

@@ -210,6 +210,7 @@ async function main () {
     envName: core.getInput('environment-name'),
     envFile: core.getInput('environment-file'),
     extraSpecs: getInputAsArray('extra-specs'),
+    channels: core.getInput('channels'),
     cacheDownloads: core.getBooleanInput('cache-downloads'),
     cacheDownloadsKey: core.getInput('cache-downloads-key'),
     cacheEnv: core.getBooleanInput('cache-env'),
@@ -218,31 +219,33 @@ async function main () {
     // cacheEnvAlwaysUpdate: core.getBooleanInput('cache-env-always-update')
     cacheEnvAlwaysUpdate: false
   }
-  const micromambaUrl = MICROMAMBA_PLATFORM_URL + inputs.micromambaVersion
 
-  let envFilePath
-  let envName = inputs.envName
+  let envFilePath, envYaml
 
-  // .condarc setup
-  touch(PATHS.condarc)
-  if (inputs.envFile !== 'false') {
+  // Read environment file
+  if (inputs.envFile === 'false') {
+    if (!inputs.envName) {
+      throw Error("Must provide 'environment-name' for 'environment-file: false'")
+    }
+  } else {
     envFilePath = path.join(process.env.GITHUB_WORKSPACE || '', inputs.envFile)
-    let condarcOpts = `
+    if (!envFilePath.endsWith('.lock')) {
+      envYaml = yaml.safeLoad(fs.readFileSync(envFilePath, 'utf8'))
+    }
+  }
+
+  // Setup .condarc
+  touch(PATHS.condarc)
+  let condarcOpts = `
 always_yes: true
 show_channel_urls: true
 channel_priority: strict
 `
-    if (!envFilePath.endsWith('.lock')) {
-      const envYaml = yaml.safeLoad(fs.readFileSync(envFilePath, 'utf8'))
-      if (!envName) {
-        envName = envYaml.name
-      }
-      if (envYaml.channels !== undefined) {
-        condarcOpts += `channels: [${envYaml.channels.join(', ')}]`
-      }
-    }
-    fs.appendFileSync(PATHS.condarc, condarcOpts)
+  const channels = inputs.channels + (envYaml?.channels || []).join(', ')
+  if (channels) {
+    condarcOpts += `channels: [${channels}]`
   }
+  fs.appendFileSync(PATHS.condarc, condarcOpts)
   core.debug(`Contents of ${PATHS.condarc}:\n${fs.readFileSync(PATHS.condarc)}`)
 
   // Install micromamba
@@ -253,6 +256,7 @@ channel_priority: strict
       linux: installMicromambaPosix,
       osx: installMicromambaPosix
     }[MAMBA_PLATFORM]
+    const micromambaUrl = MICROMAMBA_PLATFORM_URL + inputs.micromambaVersion
     await installer(micromambaUrl)
     core.exportVariable('MAMBA_ROOT_PREFIX', PATHS.micromambaRoot)
     core.exportVariable('MAMBA_EXE', PATHS.micromambaExe)
@@ -263,6 +267,7 @@ channel_priority: strict
   touch(PATHS.bashprofile)
 
   // Install env
+  const envName = inputs.envName || envYaml?.name
   if (envName) {
     core.startGroup(`Install environment ${envName} from ${envFilePath || ''} ${inputs.extraSpecs || ''}...`)
     let downloadCacheHit, downloadCacheArgs, envCacheHit, envCacheArgs
@@ -291,7 +296,7 @@ channel_priority: strict
     }
 
     // Add micromamba activate to profile
-    const autoactivateCmd = `micromamba activate ${envName}`
+    const autoactivateCmd = `micromamba activate ${envName};`
     if (MAMBA_PLATFORM === 'win') {
       const powershellAutoActivateEnv = `if (!(Test-Path $profile))
 {