mirror of
https://gitlab.freedesktop.org/libinput/libei.git
synced 2025-12-30 09:30:09 +01:00
CI: the check-commit and check-merge-request should use the ci-fairy image
This commit is contained in:
parent
1153368946
commit
fe337d9866
2 changed files with 8 additions and 16 deletions
|
|
@ -83,11 +83,9 @@ fail-if-fork-is-not-public:
|
|||
# $SRCDIR/.gitlab-ci/generate-gitlab-ci.py
|
||||
#
|
||||
check-ci-script:
|
||||
image: golang:alpine
|
||||
extends:
|
||||
- .fdo.ci-fairy
|
||||
stage: prep
|
||||
before_script:
|
||||
- apk add python3 py-pip git
|
||||
- pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
|
||||
script:
|
||||
- ci-fairy generate-template
|
||||
- git diff --exit-code && exit 0 || true
|
||||
|
|
@ -117,11 +115,9 @@ check-commit:
|
|||
#
|
||||
|
||||
check-merge-request:
|
||||
image: golang:alpine
|
||||
extends:
|
||||
- .fdo.ci-fairy
|
||||
stage: deploy
|
||||
before_script:
|
||||
- apk add python3 py-pip git
|
||||
- pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
|
||||
script:
|
||||
- ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
|
||||
artifacts:
|
||||
|
|
|
|||
|
|
@ -93,11 +93,9 @@ fail-if-fork-is-not-public:
|
|||
# $SRCDIR/.gitlab-ci/generate-gitlab-ci.py
|
||||
#
|
||||
check-ci-script:
|
||||
image: golang:alpine
|
||||
extends:
|
||||
- .fdo.ci-fairy
|
||||
stage: prep
|
||||
before_script:
|
||||
- apk add python3 py-pip git
|
||||
- pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
|
||||
script:
|
||||
- ci-fairy generate-template
|
||||
- git diff --exit-code && exit 0 || true
|
||||
|
|
@ -127,11 +125,9 @@ check-commit:
|
|||
#
|
||||
|
||||
check-merge-request:
|
||||
image: golang:alpine
|
||||
extends:
|
||||
- .fdo.ci-fairy
|
||||
stage: deploy
|
||||
before_script:
|
||||
- apk add python3 py-pip git
|
||||
- pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
|
||||
script:
|
||||
- ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
|
||||
artifacts:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue