Commit 6f86b8bc authored by Florian Muellner's avatar Florian Muellner
Browse files

ci-fairy: Change default rules file



Jonas suggested that the name reads easier with a dash, so go with that
instead of the more Germanic compound word.
Signed-off-by: Florian Muellner's avatarFlorian Müllner <fmuellner@gnome.org>
parent 18194044
Pipeline #253758 passed with stages
in 1 minute and 43 seconds
......@@ -154,7 +154,7 @@ ci-fairy images:
.ci-fairy-tag:
variables:
FDO_DISTRIBUTION_TAG: sha256-754a2c72cf4a7e258ba19bc895ad749ddac120842b7121355d9a3586cb9ea942
FDO_DISTRIBUTION_TAG: sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1
.ci-fairy-local-image:
extends:
......@@ -292,7 +292,7 @@ test published images:
script:
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-aarch64-2020-12-18.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:buildah-x86_64-2020-12-18.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-754a2c72cf4a7e258ba19bc895ad749ddac120842b7121355d9a3586cb9ea942
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-base-x86_64-2020-12-18.2
- skopeo inspect docker://quay.io/freedesktop.org/ci-templates:qemu-mkosi-base-x86_64-2020-12-18.2
rules:
......
......@@ -23,7 +23,7 @@ ci-fairy-base-image:
.ci-fairy-tag:
variables:
FDO_DISTRIBUTION_TAG: sha256-754a2c72cf4a7e258ba19bc895ad749ddac120842b7121355d9a3586cb9ea942
FDO_DISTRIBUTION_TAG: sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1
# The actual ci-fairy image with ci-fairy installed
# This image uses the sha of the ci-fairy script itself as tag.
......
......@@ -265,7 +265,7 @@ a line is **not** included (``--no-signed-off-by``). See the ``--help``
output for a list fo checks available.
It is possible to provide custom rule definitions in YAML format, either in
``.gitlab-ci/commitrules.yml`` if it exists, or by specifying a file with the
``.gitlab-ci/commit-rules.yml`` if it exists, or by specifying a file with the
``--rules-file`` option. An example rules files:
.. code-block:: yaml
......
......@@ -31,6 +31,6 @@
# Variables provided by this template should be considered read-only.
#
.fdo.ci-fairy:
image: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-754a2c72cf4a7e258ba19bc895ad749ddac120842b7121355d9a3586cb9ea942
image: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1
variables:
FDO_DISTRIBUTION_IMAGE: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-754a2c72cf4a7e258ba19bc895ad749ddac120842b7121355d9a3586cb9ea942
\ No newline at end of file
FDO_DISTRIBUTION_IMAGE: quay.io/freedesktop.org/ci-templates:ci-fairy-sha256-05d57f60eb670e4d137aa3401f77b75599fccf841b98365d9f433a8d218777f1
\ No newline at end of file
......@@ -1086,7 +1086,7 @@ def check_commits(ctx, commit_range, branch, signed_off_by, textwidth, rules_fil
logger.debug(f'Using commit range {commit_range}')
if rules_file is None:
default_rules = Path('.gitlab-ci/commitrules.yml')
default_rules = Path('.gitlab-ci/commit-rules.yml')
if default_rules.exists():
rules_file = default_rules.open()
......
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