Skip to content
Snippets Groups Projects
Commit e63c3228 authored by Thomas Kluyver's avatar Thomas Kluyver
Browse files

Replace deprecated 'only:' in CI with newer 'rules:'

parent 3976ee21
No related branches found
No related tags found
1 merge request!1127Replace deprecated 'only:' in CI with newer 'rules:'
workflow:
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
stages: stages:
- check - check
- test - test
...@@ -25,7 +30,8 @@ default: ...@@ -25,7 +30,8 @@ default:
checks: checks:
stage: check stage: check
only: [merge_requests] rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
allow_failure: true allow_failure: true
script: script:
- export PATH=/home/gitlab-runner/.local/bin:$PATH - export PATH=/home/gitlab-runner/.local/bin:$PATH
...@@ -42,7 +48,6 @@ checks: ...@@ -42,7 +48,6 @@ checks:
pytest: pytest:
stage: test stage: test
only: [merge_requests]
script: script:
- export LANG=C # Hopefully detect anything relying on locale - export LANG=C # Hopefully detect anything relying on locale
- python3 -m pip install ".[test]" --index-url https://git.xfel.eu/api/v4/groups/501/-/packages/pypi/simple - python3 -m pip install ".[test]" --index-url https://git.xfel.eu/api/v4/groups/501/-/packages/pypi/simple
...@@ -59,7 +64,6 @@ pytest: ...@@ -59,7 +64,6 @@ pytest:
cython-editable-install-test: cython-editable-install-test:
stage: test stage: test
only: [merge_requests]
script: script:
- python3 -m pip install -e ".[test]" --index-url https://git.xfel.eu/api/v4/groups/501/-/packages/pypi/simple - python3 -m pip install -e ".[test]" --index-url https://git.xfel.eu/api/v4/groups/501/-/packages/pypi/simple
- python3 -m pytest --color yes --verbose ./tests/test_cythonalgs.py - python3 -m pytest --color yes --verbose ./tests/test_cythonalgs.py
...@@ -72,7 +76,8 @@ automated_test: ...@@ -72,7 +76,8 @@ automated_test:
PYENV_VERSION: "3.11" PYENV_VERSION: "3.11"
CAL_CAL_TOOLS_CALCAT: "{base-api-url='http://exflcalproxy:8080/api', use-oauth2=false}" CAL_CAL_TOOLS_CALCAT: "{base-api-url='http://exflcalproxy:8080/api', use-oauth2=false}"
stage: automated_test stage: automated_test
only: [merge_requests] rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
when: manual when: manual
allow_failure: false allow_failure: false
tags: tags:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment