Commit 5684b871 authored by Philipp Schubert's avatar Philipp Schubert
Browse files

Update .gitlab-ci.yml file

parent e3da4b22
......@@ -19,12 +19,9 @@ build-full:
- conda env create -f environment.yml -n pysyintegration_m python --force
- source ~/.bashrc
- conda activate pysyintegration_m
only:
- master
- merge_requests
except:
variables:
- $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
test-full:
stage: test
......@@ -33,23 +30,17 @@ test-full:
- conda activate pysyintegration_m
- pip install --upgrade --no-deps -v -e .
- python -m pytest -c tests/full_run.ini
only:
- master
- merge_requests
except:
variables:
- $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
cleanup:
stage: cleanup
script:
- conda remove --yes -n pysyintegration_m --all
when: always
only:
- master
- merge_requests
except:
variables:
- $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
pylint:
stage: test
......@@ -66,9 +57,6 @@ pylint:
- ./pylint/
expire_in: 2 yrs
allow_failure: true
only:
- master
- merge_requests
except:
variables:
- $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"
\ No newline at end of file
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
\ No newline at end of file
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