Merge branch 'rf/manifest-rules' into 'master'

Rf/manifest rules

See merge request fsl/conda/manifest!1

.gitlab-ci.yml

@@ -61,10 +61,10 @@ stages:
   - publish
 
 
-# Generate FSL conda environment.yml files,
-# for all supported platforms and CUDA
-# versions, from fsl-release.yml. Refer to
-# the scripts/generate_environment_files.py
+# Generate FSL conda environment.yml files, for
+# all supported platforms and CUDA versions,
+# from fsl-release.yml. Refer to the
+# manifest_rules//generate_environment_files.py
 # script for details.
 generate-environment-files:
   stage: generate-environment-files
@@ -73,7 +73,7 @@ generate-environment-files:
     - fsl-ci
     - docker
   script:
-    - generate_environment_files ./environments
+    - generate_environment_files fsl-release.yml ./environments
   artifacts:
     expire_in: 2 hrs
     paths:
@@ -101,7 +101,7 @@ generate-environment-files:
     - docker
   script:
     - mkdir ./test_environments
-    - test_environment ./environments/*${SUFFIX}.yml 2>&1 | tee test_environments/${SUFFIX}.install.txt
+    - test_environment ./fsl-release.yml ./environments/*${SUFFIX}.yml 2>&1 | tee test_environments/${SUFFIX}.install.txt
   artifacts:
     expire_in: 2 hrs
     when: always
@@ -152,7 +152,7 @@ test-environment:linux-64_cudaX.Y:
     - test-environment:linux-64_cudaX.Y
   script:
     - mkdir -p ./manifest
-    - generate_manifest_file "$OFFICIAL" ./manifest ./environments ./test_environments
+    - generate_manifest_file ./fsl-release.yml "$OFFICIAL" ./manifest ./environments ./test_environments
   artifacts:
     expire_in: 2 hrs
     paths:

README.md

@@ -2,7 +2,10 @@
 
 
 This repository is used to manage FSL releases. The `fsl-release.yml` file
-defines the packages that are installed as part of a FSL release.
+defines the packages that are installed as part of a FSL release. FSL release
+`manifest.json` and `environment.yml` files are automatically generated from
+information stored in this repository, using scripts in the
+fsl/conda/manifest-rules> repository.
 
 
 ## The `fslinstaller.py` script

fsl-release.yml

@@ -3,8 +3,7 @@
 # file is assumed to be downloadable from this URL.
 # URLs for newly generated environment files are
 # constructed using this URL.
-#release_url: http://18.133.213.73/releases/
-release_url: http://localhost:8888/
+release_url: http://18.133.213.73/releases/
 
 # Latest fslinstaller version
 installer: 1.0.8