From 09509c9de66726c2b06bf7028b772bc56dd3a45d Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Wed, 18 Mar 2020 12:18:43 +0100 Subject: [PATCH] ci: move the ci template to the expected file for ci-fairy this makes the command to type much easier Signed-off-by: Benjamin Tissoires --- .gitlab-ci.yml | 2 +- .gitlab-ci/{gitlab-ci.tmpl => ci.template} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename .gitlab-ci/{gitlab-ci.tmpl => ci.template} (99%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e32be64..6bebc41b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,7 +141,7 @@ check-ci-script: - apk add python3 git - pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates script: - - ci-fairy generate-template --config .gitlab-ci/config.yml .gitlab-ci/gitlab-ci.tmpl -o .gitlab-ci.yml + - ci-fairy generate-template - git diff --exit-code && exit 0 || true - echo "Committed gitlab-ci.yml differs from generated gitlab-ci.yml. Please verify" - exit 1 diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/ci.template similarity index 99% rename from .gitlab-ci/gitlab-ci.tmpl rename to .gitlab-ci/ci.template index 568c64c4..ead6b524 100644 --- a/.gitlab-ci/gitlab-ci.tmpl +++ b/.gitlab-ci/ci.template @@ -137,7 +137,7 @@ check-ci-script: - apk add python3 git - pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates script: - - ci-fairy generate-template --config .gitlab-ci/config.yml .gitlab-ci/gitlab-ci.tmpl -o .gitlab-ci.yml + - ci-fairy generate-template - git diff --exit-code && exit 0 || true - echo "Committed gitlab-ci.yml differs from generated gitlab-ci.yml. Please verify" - exit 1