From a114395f9948aa3b41a4161bedb7e313d1585397 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 2 Mar 2023 17:24:55 +0000 Subject: [PATCH] Update 4 files - /build/npm.yml - /build/composer.yml - /build/docker.yml - /deploy/kubernetes.yml --- build/composer.yml | 6 ++++++ build/docker.yml | 8 ++++++++ build/npm.yml | 3 +++ deploy/kubernetes.yml | 8 ++++++++ 4 files changed, 25 insertions(+) diff --git a/build/composer.yml b/build/composer.yml index 460f616..47a48b6 100644 --- a/build/composer.yml +++ b/build/composer.yml @@ -13,6 +13,12 @@ composer-build: paths: - vendor allow_failure: false + dependencies: + - npm-build + - composer-build + needs: + - job: composer-security + optional: true rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_COMMIT_BRANCH == "develop" \ No newline at end of file diff --git a/build/docker.yml b/build/docker.yml index f8d288b..86ed92b 100644 --- a/build/docker.yml +++ b/build/docker.yml @@ -35,6 +35,14 @@ docker-build:develop: - if: $CI_COMMIT_BRANCH == "develop" +docker-build:staging: + extends: .docker-build + variables: + IMAGE_TAG: "${CI_REGISTRY_IMAGE}:staging" + rules: + - if: $CI_COMMIT_BRANCH == "trunk" + + docker-build:latest: extends: .docker-build variables: diff --git a/build/npm.yml b/build/npm.yml index 02b856e..ad86c81 100644 --- a/build/npm.yml +++ b/build/npm.yml @@ -13,6 +13,9 @@ npm-build: paths: - public/build allow_failure: false + needs: + - job: npm-security + optional: true rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_COMMIT_BRANCH == "develop" diff --git a/deploy/kubernetes.yml b/deploy/kubernetes.yml index e322231..8396ce4 100644 --- a/deploy/kubernetes.yml +++ b/deploy/kubernetes.yml @@ -24,6 +24,8 @@ kubernetes:review: extends: .kubernetes variables: KUBE_NAMESPACE: review + needs: + - job: docker-build:review rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" environment: @@ -43,8 +45,11 @@ kubernetes:staging: extends: .kubernetes variables: KUBE_NAMESPACE: staging + needs: + - job: docker-build:staging rules: - if: $CI_COMMIT_BRANCH == "trunk" + when: manual environment: name: staging url: https://re7-${CI_PROJECT_NAME}.k8s.s-web.fr @@ -62,8 +67,11 @@ kubernetes:prod: extends: .kubernetes variables: KUBE_NAMESPACE: production + needs: + - job: docker-build:latest rules: - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_TAG != null + when: manual environment: name: production url: https://production-${CI_PROJECT_NAME}.k8s.s-web.fr