Commit 306a3a5d authored by Peter Hutterer's avatar Peter Hutterer
Browse files

gitlab CI: move the merge-request check to the deploy stage



Previously the "pages" stage, now the "deploy" stage because that's a bit more
sensible if we're checking the merge request too. Checking the merge request
should be performed late in the CI run to give a user enough time to actually
file the merge request before the job fails.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent a7ea345b
......@@ -82,7 +82,7 @@ stages:
- fedora_check
- ubuntu_container_build
- ubuntu_check
- pages
- deploy
#
......@@ -113,24 +113,6 @@ sanity check:
- exit 1
check merge request:
extends: .pip_install
script:
- pip3 install .
- ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
artifacts:
expire_in: 1 week
when: on_failure
paths:
- check-merge-request.xml
reports:
junit: check-merge-request.xml
variables:
FDO_UPSTREAM_REPO: freedesktop/ci-templates
# We allow this to fail because no MR may have been filed yet
allow_failure: true
check commits:
extends: .pip_install
script:
......@@ -167,9 +149,28 @@ flake8 ci-fairy:
- flake8 --ignore=W501,E501,W504,W741,E741
check merge request:
extends: .pip_install
stage: deploy
script:
- pip3 install .
- ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
artifacts:
expire_in: 1 week
when: on_failure
paths:
- check-merge-request.xml
reports:
junit: check-merge-request.xml
variables:
FDO_UPSTREAM_REPO: freedesktop/ci-templates
# We allow this to fail because no MR may have been filed yet
allow_failure: true
pages:
extends: .pip_install
stage: pages
stage: deploy
script:
- pip3 install sphinx sphinx-rtd-theme
# Upstream bug in the HTML rendering for YAML nodes so let's used the fixed version
......
......@@ -26,7 +26,7 @@ stages:
- {{distribution}}_container_build
- {{distribution}}_check
{% endfor %}
- pages
- deploy
#
......@@ -57,24 +57,6 @@ sanity check:
- exit 1
check merge request:
extends: .pip_install
script:
- pip3 install .
- ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
artifacts:
expire_in: 1 week
when: on_failure
paths:
- check-merge-request.xml
reports:
junit: check-merge-request.xml
variables:
FDO_UPSTREAM_REPO: freedesktop/ci-templates
# We allow this to fail because no MR may have been filed yet
allow_failure: true
check commits:
extends: .pip_install
script:
......@@ -111,9 +93,28 @@ flake8 ci-fairy:
- flake8 --ignore=W501,E501,W504,W741,E741
check merge request:
extends: .pip_install
stage: deploy
script:
- pip3 install .
- ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
artifacts:
expire_in: 1 week
when: on_failure
paths:
- check-merge-request.xml
reports:
junit: check-merge-request.xml
variables:
FDO_UPSTREAM_REPO: freedesktop/ci-templates
# We allow this to fail because no MR may have been filed yet
allow_failure: true
pages:
extends: .pip_install
stage: pages
stage: deploy
script:
- pip3 install sphinx sphinx-rtd-theme
# Upstream bug in the HTML rendering for YAML nodes so let's used the fixed version
......
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