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

Merge branch 'rf/skip_test_manifest' into 'master'

Rf/skip test manifest

See merge request fsl/conda/manifest-rules!8
parents 5d2be6db db8297e3
......@@ -44,10 +44,13 @@ stages:
# files for all platforms and CUDA versions
- generate-environment-files
# Do a test installation for all environment
# files, and calculate the number of expected
# output lines so that the fslinstaller
# script can report progress to the user.
# Do a test installation for all environment files,
# and calculate the number of expected output lines
# so that the fslinstaller script can report
# progress to the user. A full test is performed on
# PUBLISH_FROM_BRANCHES branches, otherwise a fast
# test is performed - see the test_environmemt.py
# script.
- test-environments
# Generate release or development manifest.json
......@@ -55,7 +58,9 @@ stages:
- generate-manifest-files
# Run the fslinstaller.py script against
# the generated manifest files
# the generated manifest files. This stage
# is only run on PUBLISH_FROM_BRANCHES
# branches - see the test_manifest.py script.
- test-manifests
# Publish the manifest and/or environment files.
......
#!/usr/bin/env python
__version__ = '0.3.4'
__version__ = '0.3.5'
......@@ -19,6 +19,19 @@ def main():
username = os.environ['FSLCONDA_USERNAME']
password = os.environ['FSLCONDA_PASSWORD']
publish_from_branches = os.environ.get('PUBLISH_FROM_BRANCHES', '')
branch = os.environ.get('CI_COMMIT_BRANCH', None)
tag = os.environ.get('CI_COMMIT_TAG', None)
run_test = ((tag is not None) or
((branch is not None) and
(branch in publish_from_branches)))
if not run_test:
print('This test is only run on tags and these '
f'branches: {publish_from_branches}')
sys.exit(0)
with open(manifest_file, 'rt') as f:
manifest = json.loads(f.read())
......
Markdown is supported
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