Commit 27d01e0f authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'enh/m1' into 'master'

Enh/m1

See merge request fsl/conda/manifest-rules!37
parents 264ec2dc db062bde
......@@ -133,9 +133,9 @@ generate-environment-files:
# all platforms. Information about the
# installation of each environment file is saved
# to test_install/<environment_file>.install.txt.
# The macos-64 test job is run on a macOS shell
# runner - it is assumed that that conda is
# installed in the environment.
# The macos-64/macos-M1 test jobs are run on macOS
# shell runners - it is assumed that that conda
# is installed in those environment.
# This is a template. Concrete test jobs (below)
# specify a SUFFIX variable, denoting the
......@@ -144,7 +144,7 @@ generate-environment-files:
stage: test-environments
dependencies:
- generate-environment-files
# tags and image is overridden by the macOS job
# tags and image is overridden by the macOS jobs
tags:
- fsl-ci
- docker
......@@ -161,10 +161,18 @@ test-environment:macos-64:
extends: .test-environments
tags:
- fsl-ci
- macOS
- macOS-64
variables:
SUFFIX: "macos-64"
test-environment:macos-M1:
extends: .test-environments
tags:
- fsl-ci
- macOS-M1
variables:
SUFFIX: "macos-M1"
test-environment:linux-64:
extends: .test-environments
image: fsldevelopment/fsl-linux-64
......@@ -198,6 +206,7 @@ test-environment:linux-64_cudaX.Y:
- generate-environment-files
- test-environment:linux-64
- test-environment:macos-64
- test-environment:macos-M1
- test-environment:linux-64_cudaX.Y
script:
- mkdir -p ./manifest
......@@ -276,7 +285,19 @@ test-manifest:macos-64:
SUFFIX: "macos-64"
tags:
- fsl-ci
- macOS
- macOS-64
dependencies:
- generate-environment-files
- generate-release-manifest-file
test-manifest:macos-M1:
stage: test-manifests
extends: .test-manifest
variables:
SUFFIX: "macos-M1"
tags:
- fsl-ci
- macOS-M1
dependencies:
- generate-environment-files
- generate-release-manifest-file
......
#!/usr/bin/env python
__version__ = '0.6.4'
__version__ = '0.7.0'
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