Skip to content
Snippets Groups Projects
Commit b194b04e authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

[data/gitlab-ci] Refactor to remove all references to $CI_RUNNER_TAGS [ci skip]

parent b3e02403
No related branches found
No related tags found
1 merge request!334Fix changed runner tags
Pipeline #66531 skipped
...@@ -29,8 +29,8 @@ stages: ...@@ -29,8 +29,8 @@ stages:
- python3 bootstrap.py -vv channel base - python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh - source ${CONDA_ROOT}/etc/profile.d/conda.sh
- conda activate base - conda activate base
- if [[ "${CI_RUNNER_TAGS}" =~ bob.*docker\|docker.*bob ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi
- conda clean --all - conda clean --all
- git config --global --add safe.directory ${CI_PROJECT_DIR}
cache: cache:
paths: paths:
- .cache/torch - .cache/torch
......
...@@ -21,7 +21,6 @@ stages: ...@@ -21,7 +21,6 @@ stages:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py" - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel base - python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh - source ${CONDA_ROOT}/etc/profile.d/conda.sh
- if [[ "${CI_RUNNER_TAGS}" =~ bob.*docker\|docker.*bob ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi
- conda activate base - conda activate base
- conda clean --all - conda clean --all
cache: cache:
...@@ -48,6 +47,19 @@ stages: ...@@ -48,6 +47,19 @@ stages:
variables: variables:
# The version of cuda at Idiap # The version of cuda at Idiap
CONDA_OVERRIDE_CUDA: "11.6" CONDA_OVERRIDE_CUDA: "11.6"
before_script:
- !reference [.bootstrap, before_script]
- git config --global --add safe.directory ${CI_PROJECT_DIR}
- bdt ci check -vv
.build_macos_template:
extends: .build_template
tags:
- bob
- macos
before_script:
- !reference [.bootstrap, before_script]
- bdt ci check -vv
build_linux_39: build_linux_39:
extends: .build_linux_template extends: .build_linux_template
...@@ -64,50 +76,45 @@ build_linux_310: ...@@ -64,50 +76,45 @@ build_linux_310:
key: 'build-py310' key: 'build-py310'
build_macos_intel_39: build_macos_intel_39:
extends: .build_template extends: .build_macos_template
variables: variables:
PYTHON_VERSION: "3.9" PYTHON_VERSION: "3.9"
tags: tags:
- bob - !reference [.build_macos_template, tags]
- macos
- intel - intel
cache: cache:
key: 'build-py39' key: 'build-py39'
build_macos_intel_310: build_macos_intel_310:
extends: .build_template extends: .build_macos_template
variables: variables:
PYTHON_VERSION: "3.10" PYTHON_VERSION: "3.10"
tags: tags:
- bob - !reference [.build_macos_template, tags]
- macos
- intel - intel
cache: cache:
key: 'build-py310' key: 'build-py310'
build_macos_arm_39: build_macos_arm_39:
extends: .build_template extends: .build_macos_template
variables: variables:
PYTHON_VERSION: "3.9" PYTHON_VERSION: "3.9"
tags: tags:
- bob - !reference [.build_macos_template, tags]
- macos
- arm - arm
cache: cache:
key: 'build-py39' key: 'build-py39'
build_macos_arm_310: build_macos_arm_310:
extends: .build_template extends: .build_macos_template
variables: variables:
PYTHON_VERSION: "3.10" PYTHON_VERSION: "3.10"
tags: tags:
- bob - !reference [.build_macos_template, tags]
- macos
- arm - arm
cache: cache:
key: 'build-py310' key: 'build-py310'
# Periodic cleanup of beta packages # Periodic cleanup of beta packages
.cleanup_template: .cleanup_template:
extends: .bootstrap extends: .bootstrap
......
...@@ -23,10 +23,7 @@ stages: ...@@ -23,10 +23,7 @@ stages:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py" - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel base - python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh - source ${CONDA_ROOT}/etc/profile.d/conda.sh
# for conda inspect during builds (on macos)
- if [[ "${CI_RUNNER_TAGS}" =~ bob.*docker\|docker.*bob ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi
- conda activate base - conda activate base
- bdt ci check -vv
- conda clean --all - conda clean --all
cache: cache:
paths: paths:
...@@ -59,6 +56,10 @@ build_linux: ...@@ -59,6 +56,10 @@ build_linux:
variables: variables:
PYTHON_VERSION: "3.10" PYTHON_VERSION: "3.10"
BUILD_EGG: "true" BUILD_EGG: "true"
before_script:
- !reference [.bootstrap, before_script]
- git config --global --add safe.directory ${CI_PROJECT_DIR}
- bdt ci check -vv
script: script:
- bdt ci build -vv - bdt ci build -vv
- bdt ci readme -vv dist/*.zip - bdt ci readme -vv dist/*.zip
...@@ -83,6 +84,9 @@ build_macos_intel: ...@@ -83,6 +84,9 @@ build_macos_intel:
- bob - bob
- macos - macos
- intel - intel
before_script:
- !reference [.bootstrap, before_script]
- bdt ci check -vv
build_macos_arm: build_macos_arm:
...@@ -95,6 +99,9 @@ build_macos_arm: ...@@ -95,6 +99,9 @@ build_macos_arm:
- bob - bob
- macos - macos
- arm - arm
before_script:
- !reference [.bootstrap, before_script]
- bdt ci check -vv
# Test targets (not normally used) # Test targets (not normally used)
......
...@@ -26,7 +26,7 @@ build: ...@@ -26,7 +26,7 @@ build:
- docker - docker
stage: build stage: build
before_script: before_script:
- if [[ "${CI_RUNNER_TAGS}" =~ bob.*docker\|docker.*bob ]]; then git config --global --add safe.directory ${CI_PROJECT_DIR}; fi - git config --global --add safe.directory ${CI_PROJECT_DIR}
- pip install twine pre-commit sphinx sphinx-rtd-theme - pip install twine pre-commit sphinx sphinx-rtd-theme
script: script:
- "[ -r .pre-commit-config.yaml ] && pre-commit run --all-files --show-diff-on-failure --verbose" - "[ -r .pre-commit-config.yaml ] && pre-commit run --all-files --show-diff-on-failure --verbose"
......
...@@ -23,8 +23,8 @@ stages: ...@@ -23,8 +23,8 @@ stages:
- curl --silent "${BOOTSTRAP}" --output "bootstrap.py" - curl --silent "${BOOTSTRAP}" --output "bootstrap.py"
- python3 bootstrap.py -vv channel base - python3 bootstrap.py -vv channel base
- source ${CONDA_ROOT}/etc/profile.d/conda.sh - source ${CONDA_ROOT}/etc/profile.d/conda.sh
# for conda inspect during builds (on macos)
- conda activate base - conda activate base
- conda clean --all
cache: cache:
paths: paths:
- miniconda.sh - miniconda.sh
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment