From 60e0995360d69dd91c974cabfa85a3717ffb2e77 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 23 Nov 2020 13:16:14 +1000 Subject: [PATCH] gitlab CI: use ci-fairy generate-template --verify Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 3 +-- .gitlab-ci/ci.template | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5e14e8c..f4208126 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,8 +145,7 @@ check-ci-script: - .fdo.ci-fairy stage: prep script: - - ci-fairy generate-template - - git diff --exit-code && exit 0 || true + - ci-fairy generate-template --verify && exit 0 || true - echo "Committed gitlab-ci.yml differs from generated gitlab-ci.yml. Please verify" - exit 1 diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index d9eb7187..68edbd67 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -133,8 +133,7 @@ check-ci-script: - .fdo.ci-fairy stage: prep script: - - ci-fairy generate-template - - git diff --exit-code && exit 0 || true + - ci-fairy generate-template --verify && exit 0 || true - echo "Committed gitlab-ci.yml differs from generated gitlab-ci.yml. Please verify" - exit 1