CI: update paths, turn on fsl-ci-rules

.ci/new_release.sh

@@ -11,11 +11,14 @@ set -e
 
 
 # Make sure that the installer version matches the tag
-scriptver=$(cat fslinstaller.py | grep "__version__ = " | cut -d " " -f 3 | tr -d "'")
+scriptver=$(cat fsl/installer/fslinstaller.py |
+              grep "__version__ = "           |
+              cut -d " " -f 3                 |
+              tr -d "'")
 
 if [ "$scriptver" != "$CI_COMMIT_TAG" ]; then
   echo "Version in fslinstaller.py does not match tag! $scriptver != $CI_COMMIT_TAG"
   exit 1
 fi
 
-cp fslinstaller.py $FSLINSTALLER_DEPLOY_DIRECTORY/
+cp fsl/installer/fslinstaller.py $FSLINSTALLER_DEPLOY_DIRECTORY/

.ci/unit_tests.sh

 #!/usr/bin/env bash
 pip install --upgrade pip setuptools wheel
 pip install pytest coverage pytest-cov mock typing
-pytest -v --cov=fslinstaller test
+pytest -v --cov=fsl test

.gitlab-ci.yml

 # CI / CD for the fsl/conda/installer project.
-#
-# Unit tests are run every time commits are
-# pushed to any branch.
-#
-# Release jobs are run every time a new tag
-# is added. Release jobs assume that they
+
+# Unit tests are run in the test stage every
+# time commits are pushed to any branch.
+
+# The check-version stage is run on
+# non-master branches - it checks that the
+# fslinstaller version has been changed.
+
+# The release stage is run every time a new
+# tag is added. Release jobs assume that they
 # are running in an environment with a
 # directory $FSLINSTALLER_DEPLOY_DIRECTORY
 # into which the fslinstaller.py script can
 # be copied.
+
+# The fsl-ci stages are defined in the
+# fsl/conda/fsl-ci-rules repository - they are
+# used to build the fslinstaller conda package.
 stages:
   - test
   - check-version
   - release
+  - fsl-ci-pre
+  - fsl-ci-build
+  - fsl-ci-test
+  - fsl-ci-deploy
+
 
 # Don't run pipeline on MRs
 workflow: