[polari] ci: Reindent yaml configuration



commit 0396ec38bbcc7fe8e8632fa0175587fc93693f55
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Aug 31 11:17:07 2021 +0200

    ci: Reindent yaml configuration
    
    Most GNOME projects have settled on a 2-space indentation, so switch
    to that. This will ease the ongoing copy+paste between projects :-)
    
    Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/220>

 .gitlab-ci.yml | 196 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 98 insertions(+), 98 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16ed40a9..ee18c743 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,117 +1,117 @@
 include:
- - remote: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
- - remote: 
'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml'
+  - remote: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+  - remote: 
'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/6f86b8bcb0cd5168c32779c4fea9a893c4a0c046/templates/ci-fairy.yml'
 
 stages:
- - pre_review
- - review
- - build
- - deploy
- - housekeeping
+  - pre_review
+  - review
+  - build
+  - deploy
+  - housekeeping
 
 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/polari
-    MANIFEST_PATH: "flatpak/org.gnome.Polari.json"
-    BUNDLE: "polari-git.flatpak"
-    LINT_LOG: "eslint-report.xml"
+  FDO_UPSTREAM_REPO: GNOME/polari
+  MANIFEST_PATH: "flatpak/org.gnome.Polari.json"
+  BUNDLE: "polari-git.flatpak"
+  LINT_LOG: "eslint-report.xml"
 
 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_PIPELINE_SOURCE == "schedule"'
-        - 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_PIPELINE_SOURCE == "schedule"'
+    - 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
 
 eslint:
-    image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/34:2021-08-12.0
-    stage: review
-    script:
-        - eslint -o $LINT_LOG -f junit --resolve-plugins-relative-to $(npm root -g) src
-    artifacts:
-        paths:
-            - ${LINT_LOG}
-        reports:
-            junit: ${LINT_LOG}
+  image: registry.gitlab.gnome.org/gnome/gnome-shell/fedora/34:2021-08-12.0
+  stage: review
+  script:
+    - eslint -o $LINT_LOG -f junit --resolve-plugins-relative-to $(npm root -g) src
+  artifacts:
+    paths:
+      - ${LINT_LOG}
+    reports:
+      junit: ${LINT_LOG}
 
 .flatpak-template:
-    stage: build
-    variables:
-        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
-        FLATPAK_MODULE: "polari"
-        APP_ID: "org.gnome.Polari"
-    extends: .flatpak
+  stage: build
+  variables:
+    RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
+    FLATPAK_MODULE: "polari"
+    APP_ID: "org.gnome.Polari"
+  extends: .flatpak
 
 flatpak:
-    variables:
-        BRANCH: "snapshot"
-        CONFIG_OPTS: "-Dsnapshot=true --werror --warnlevel 2"
-    extends: .flatpak-template
-    rules:
-        - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
+  variables:
+    BRANCH: "snapshot"
+    CONFIG_OPTS: "-Dsnapshot=true --werror --warnlevel 2"
+  extends: .flatpak-template
+  rules:
+    - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
 
 flatpak-main:
-    extends: .flatpak-template
-    rules:
-        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+  extends: .flatpak-template
+  rules:
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
 
 nightly:
   extends: '.publish_nightly'
@@ -119,11 +119,11 @@ nightly:
     BUNDLES: '$BUNDLE'
 
 check-flatpak-deps:
-    image:
-        name: ghcr.io/flathub/flatpak-external-data-checker
-        entrypoint: [""]
-    stage: housekeeping
-    script:
-        - /app/flatpak-external-data-checker $MANIFEST_PATH
-    rules:
-        - if: '$CI_PIPELINE_SOURCE == "schedule" && $POLARI_SCHEDULED_JOB == "x-checker"'
+  image:
+    name: ghcr.io/flathub/flatpak-external-data-checker
+    entrypoint: [""]
+  stage: housekeeping
+  script:
+    - /app/flatpak-external-data-checker $MANIFEST_PATH
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $POLARI_SCHEDULED_JOB == "x-checker"'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]