Commit a79e9476 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

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

Rf/manifest rules

See merge request fsl/conda/manifest!1
parents 1454a7eb 8e58ed00
...@@ -61,10 +61,10 @@ stages: ...@@ -61,10 +61,10 @@ stages:
- publish - publish
# Generate FSL conda environment.yml files, # Generate FSL conda environment.yml files, for
# for all supported platforms and CUDA # all supported platforms and CUDA versions,
# versions, from fsl-release.yml. Refer to # from fsl-release.yml. Refer to the
# the scripts/generate_environment_files.py # manifest_rules//generate_environment_files.py
# script for details. # script for details.
generate-environment-files: generate-environment-files:
stage: generate-environment-files stage: generate-environment-files
...@@ -73,7 +73,7 @@ generate-environment-files: ...@@ -73,7 +73,7 @@ generate-environment-files:
- fsl-ci - fsl-ci
- docker - docker
script: script:
- generate_environment_files ./environments - generate_environment_files fsl-release.yml ./environments
artifacts: artifacts:
expire_in: 2 hrs expire_in: 2 hrs
paths: paths:
...@@ -101,7 +101,7 @@ generate-environment-files: ...@@ -101,7 +101,7 @@ generate-environment-files:
- docker - docker
script: script:
- mkdir ./test_environments - 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: artifacts:
expire_in: 2 hrs expire_in: 2 hrs
when: always when: always
...@@ -152,7 +152,7 @@ test-environment:linux-64_cudaX.Y: ...@@ -152,7 +152,7 @@ test-environment:linux-64_cudaX.Y:
- test-environment:linux-64_cudaX.Y - test-environment:linux-64_cudaX.Y
script: script:
- mkdir -p ./manifest - mkdir -p ./manifest
- generate_manifest_file "$OFFICIAL" ./manifest ./environments ./test_environments - generate_manifest_file ./fsl-release.yml "$OFFICIAL" ./manifest ./environments ./test_environments
artifacts: artifacts:
expire_in: 2 hrs expire_in: 2 hrs
paths: paths:
......
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
This repository is used to manage FSL releases. The `fsl-release.yml` file 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 ## The `fslinstaller.py` script
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
# file is assumed to be downloadable from this URL. # file is assumed to be downloadable from this URL.
# URLs for newly generated environment files are # URLs for newly generated environment files are
# constructed using this URL. # constructed using this URL.
#release_url: http://18.133.213.73/releases/ release_url: http://18.133.213.73/releases/
release_url: http://localhost:8888/
# Latest fslinstaller version # Latest fslinstaller version
installer: 1.0.8 installer: 1.0.8
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment