Commit bdf9d5ae authored by Leo Pound Singer's avatar Leo Pound Singer

Be more consistent about CI job names

parent 3c45dc09
Pipeline #49495 failed
......@@ -21,7 +21,7 @@ sdist:
# Build binary wheels for Linux and macOS.
#
.wheel:manylinux1: &wheel-manylinux1
.wheel/manylinux1: &wheel-manylinux1
# This container is derived from the official manylinux image provided by
# python.org (see PEP 513), and includes all of the LALSuite
# build-dependencies.
......@@ -29,7 +29,7 @@ sdist:
stage: dist
script:
# Build and install LALSuite
- PYPREFIX=/opt/python/$(echo ${CI_JOB_NAME} | sed 's/.*:\(.*\)-manylinux1/\1/')
- PYPREFIX=/opt/python/$(echo ${CI_JOB_NAME} | sed 's/.*/\(.*\)-manylinux1/\1/')
- ${PYPREFIX}/bin/python setup.py bdist_wheel
- auditwheel repair dist/*.whl
- rm dist/*
......@@ -39,12 +39,12 @@ sdist:
- '*.whl'
expire_in: 3 hours
.wheel:macos: &wheel-macos
.wheel/macos: &wheel-macos
tags:
- macos_sierra
stage: dist
script:
- PYVERS=$(echo ${CI_JOB_NAME} | sed 's/.*:cp\(.\)\(.\).*/\1.\2/')
- PYVERS=$(echo ${CI_JOB_NAME} | sed 's/.*/cp\(.\)\(.\).*/\1.\2/')
# Enter virtualenv so that we have a controlled version of Numpy
- virtualenv-${PYVERS} env
- source env/bin/activate
......@@ -60,13 +60,13 @@ sdist:
- '*.whl'
expire_in: 3 hours
wheel:cp36-cp36m-manylinux1:
wheel/cp36-cp36m-manylinux1:
<<: *wheel-manylinux1
wheel:cp37-cp37m-manylinux1:
wheel/cp37-cp37m-manylinux1:
<<: *wheel-manylinux1
wheel:cp36-cp36m-macosx:
wheel/cp36-cp36m-macosx:
<<: *wheel-macos
wheel:cp37-cp37m-macosx:
wheel/cp37-cp37m-macosx:
<<: *wheel-macos
#
......@@ -262,7 +262,7 @@ pages:
# Upload to PyPI.
#
deploy:wheel:
deploy/wheel:
stage: deploy
image: containers.ligo.org/lscsoft/lalsuite-manylinux:master
variables:
......@@ -273,9 +273,9 @@ deploy:wheel:
- /opt/python/cp37-cp37m/bin/twine upload *
dependencies:
- sdist
- wheel:cp36-cp36m-manylinux1
- wheel:cp37-cp37m-manylinux1
- wheel:cp36-cp36m-macosx
- wheel:cp37-cp37m-macosx
- wheel/cp36-cp36m-manylinux1
- wheel/cp37-cp37m-manylinux1
- wheel/cp36-cp36m-macosx
- wheel/cp37-cp37m-macosx
only:
- tags
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