Merge branch 'rf/clear-channels' into 'master'

Clear channel jobs, conda init fix for package deploy runner

See merge request fsl/conda/fsl-ci-rules!103

README.md

@@ -553,7 +553,13 @@ triggered via the Gitlab UI for the `fsl-ci-rules` repository.
    `post-link.sh` / `pre-unlink.sh` scripts for **all** conda recipes.
 
  - `purge-channel-indexes`: This CI job deletes and re-generates the indexes
-   for both the staging and production channels.
+   for both the public and internal channels.
+
+ - `clear-public-channel`: This CI job can be used to delete packages from the
+   public channel.
+
+ - `clear-internal-channel`: This CI job can be used to delete packages from
+   the internal channel.
 
 
 ## Summary of environment variables

fsl_ci/__init__.py

@@ -20,7 +20,7 @@ import subprocess   as sp
 import yaml
 
 
-__version__ = '0.19.2'
+__version__ = '0.19.3'
 """Current version of the fsl-ci-rules."""
 
 

rules/fsl-ci-job-template.yml

@@ -77,12 +77,18 @@
     # dir, and install fsl-ci-rules into it. If
     # conda is not on $PATH, assume it is in
     # ${HOME}/miniconda3/
+    #
+    # If the <conda>/bin/activate script is not
+    # present for some reason, we assume that
+    # conda has been configured in the shell.
+    # This is the case on the FSL conda deploy
+    # runner.
     - if [ "$DOCKER" == "0" ]; then
         CONDABIN=$(which conda || echo "${HOME}/miniconda3/bin/conda");
         CONDADIR=$(dirname ${CONDABIN})/../bin/;
         ${CONDABIN} create -y -p ${FSL_CI_CONFIG_DIR}/env -c conda-forge python=3.9 conda-build;
         if [ -f "${CONDADIR}"/activate ]; then source ${CONDADIR}/activate ${FSL_CI_CONFIG_DIR}/env;
-        else                                   ${CONDABIN} activate        ${FSL_CI_CONFIG_DIR}/env; fi;
+        else                                   conda activate              ${FSL_CI_CONFIG_DIR}/env; fi;
       fi
     - if [ "$CI_PROJECT_PATH" == "fsl/conda/fsl-ci-rules" ]; then
         python -m pip install .;

rules/fsl-ci-management-rules.yml

@@ -175,5 +175,5 @@ purge-channel-indexes:
 clear-public-channel:
   extends: .clear-channel
 
-clear-private-channel:
+clear-internal-channel:
   extends: .clear-channel
\ No newline at end of file