[gnome-shell-extensions] ci: Reindent yaml configuration
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell-extensions] ci: Reindent yaml configuration
- Date: Sun, 5 Sep 2021 00:02:23 +0000 (UTC)
commit d25cc847f3c6f6c1fe66f663cc1e9e4a95145c9c
Author: Florian Müllner <fmuellner gnome org>
Date: Tue Aug 31 10:52:55 2021 +0200
ci: Reindent yaml configuration
The file currently uses a mix of 4 and 2 space indentation (with the
occasional 1 space thrown in). It looks like most GNOME projects have
settled on 2-space indentation, so use that.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/186>
.gitlab-ci.yml | 122 ++++++++++++++++++++++++++++-----------------------------
1 file changed, 61 insertions(+), 61 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61b07cb..e1faeab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,81 +1,81 @@
include:
- - remote:
"https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml"
+ - remote:
"https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml"
image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/34:2021-08-12.0
stages:
- - pre_review
- - review
- - build
+ - pre_review
+ - review
+ - build
default:
- # Cancel jobs if newer commits are pushed to the branch
- interruptible: true
- # Auto-retry jobs in case of infra failures
- retry:
- max: 1
- when:
- - 'runner_system_failure'
- - 'stuck_or_timeout_failure'
- - 'scheduler_failure'
- - 'api_failure'
+ # Cancel jobs if newer commits are pushed to the branch
+ interruptible: true
+ # Auto-retry jobs in case of infra failures
+ retry:
+ max: 1
+ when:
+ - 'runner_system_failure'
+ - 'stuck_or_timeout_failure'
+ - 'scheduler_failure'
+ - 'api_failure'
variables:
- FDO_UPSTREAM_REPO: GNOME/gnome-shell-extensions
- LINT_LOG: "eslint-report.xml"
- JS_LOG: "js-report.txt"
+ FDO_UPSTREAM_REPO: GNOME/gnome-shell-extensions
+ LINT_LOG: "eslint-report.xml"
+ JS_LOG: "js-report.txt"
workflow:
- rules:
- - if: '$CI_MERGE_REQUEST_IID'
- - if: '$CI_COMMIT_TAG'
- - if: '$CI_COMMIT_BRANCH'
+ rules:
+ - if: '$CI_MERGE_REQUEST_IID'
+ - if: '$CI_COMMIT_TAG'
+ - if: '$CI_COMMIT_BRANCH'
.pipeline_guard: &pipeline_guard
- rules:
- - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- - if: '$CI_COMMIT_TAG'
- - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
- - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/'
- - when: 'manual'
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ - if: '$CI_COMMIT_TAG'
+ - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+ - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/'
+ - when: 'manual'
check_commit_log:
- extends:
- - .fdo.ci-fairy
- stage: pre_review
- script:
- - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
- then
- ci-fairy check-commits --junit-xml=commit-message-junit-report.xml ;
- else
- echo "Not a merge request" ;
- fi
- <<: *pipeline_guard
- artifacts:
- expire_in: 1 week
- paths:
- - commit-message-junit-report.xml
- reports:
- junit: commit-message-junit-report.xml
+ extends:
+ - .fdo.ci-fairy
+ stage: pre_review
+ script:
+ - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
+ then
+ ci-fairy check-commits --junit-xml=commit-message-junit-report.xml ;
+ else
+ echo "Not a merge request" ;
+ fi
+ <<: *pipeline_guard
+ artifacts:
+ expire_in: 1 week
+ paths:
+ - commit-message-junit-report.xml
+ reports:
+ junit: commit-message-junit-report.xml
check-merge-request:
- extends:
- - .fdo.ci-fairy
- stage: pre_review
- script:
- - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
- then
- ci-fairy check-merge-request --require-allow-collaboration
--junit-xml=check-merge-request-report.xml ;
- else
- echo "Not a merge request" ;
- fi
- <<: *pipeline_guard
- artifacts:
- expire_in: 1 week
- paths:
- - check-merge-request-report.xml
- reports:
- junit: check-merge-request-report.xml
+ extends:
+ - .fdo.ci-fairy
+ stage: pre_review
+ script:
+ - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ;
+ then
+ ci-fairy check-merge-request --require-allow-collaboration
--junit-xml=check-merge-request-report.xml ;
+ else
+ echo "Not a merge request" ;
+ fi
+ <<: *pipeline_guard
+ artifacts:
+ expire_in: 1 week
+ paths:
+ - check-merge-request-report.xml
+ reports:
+ junit: check-merge-request-report.xml
js_check:
stage: review
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]