From 2f98f99f15fbc3c8d774bed9db002e757f1cdc5f Mon Sep 17 00:00:00 2001
From: Alexis POYEN <apoyen@grandlyon.com>
Date: Wed, 2 Sep 2020 09:21:36 +0200
Subject: [PATCH] Fix : yaml indentation
---
.gitlab-ci.yml | 68 +++++++++++++++++++++++++-------------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e53c72a..c4497e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,40 +17,40 @@ variables:
GIT_STRATEGY: clone
GIT_DEPTH: 0
- stages:
- - build-and-test-with-sonar-concurrently
+stages:
+ - build-and-test-with-sonar-concurrently
- build-master:
- stage: build-and-test-with-sonar-concurrently
- script:
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- - DOCKER_BUILDKIT=1 docker build --pull -t "$CI_REGISTRY_IMAGE" .
- - docker push "$CI_REGISTRY_IMAGE"
- only:
- - master
+build-master:
+ stage: build-and-test-with-sonar-concurrently
+ script:
+ - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+ - DOCKER_BUILDKIT=1 docker build --pull -t "$CI_REGISTRY_IMAGE" .
+ - docker push "$CI_REGISTRY_IMAGE"
+ only:
+ - master
- build:
- stage: build-and-test-with-sonar-concurrently
- script:
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- - DOCKER_BUILDKIT=1 docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
- - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
- except:
- - master
+build:
+ stage: build-and-test-with-sonar-concurrently
+ script:
+ - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+ - DOCKER_BUILDKIT=1 docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+ - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+ except:
+ - master
- sonarqube:
- stage: build-and-test-with-sonar-concurrently
- image: registry.forge.grandlyon.com/apoyen/sonnar-scanner-gl:master
- script:
- - go test ./... -coverprofile=coverage.out
- - >
- sonar-scanner
- -Dsonar.projectName=${CI_PROJECT_NAME}
- -Dsonar.projectVersion=1.0
- -Dsonar.sourceEncoding=UTF-8
- -Dsonar.projectBaseDir=.
- -Dsonar.host.url=${SONAR_URL}
- -Dsonar.projectKey=${SONAR_PROJECT_KEY}
- -Dsonar.login=${SONAR_TOKEN}
- -Dsonar.go.coverage.reportPaths=./coverage.out
- -Dsonar.exclusions=**/*_test.go
+sonarqube:
+ stage: build-and-test-with-sonar-concurrently
+ image: registry.forge.grandlyon.com/apoyen/sonnar-scanner-gl:master
+ script:
+ - go test ./... -coverprofile=coverage.out
+ - >
+ sonar-scanner
+ -Dsonar.projectName=${CI_PROJECT_NAME}
+ -Dsonar.projectVersion=1.0
+ -Dsonar.sourceEncoding=UTF-8
+ -Dsonar.projectBaseDir=.
+ -Dsonar.host.url=${SONAR_URL}
+ -Dsonar.projectKey=${SONAR_PROJECT_KEY}
+ -Dsonar.login=${SONAR_TOKEN}
+ -Dsonar.go.coverage.reportPaths=./coverage.out
+ -Dsonar.exclusions=**/*_test.go
--
GitLab