From de8aec41c3e53b322098df1d8bd2caf44b058513 Mon Sep 17 00:00:00 2001 From: lbellanger Date: Wed, 5 Feb 2025 09:31:21 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20accepte=20la=20branche=20'main'=20dans?= =?UTF-8?q?=20les=20'rules'=20pour=20l'=C3=A9tape=20de=20preprod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/deploy-portainer.yml | 2 +- templates/images-docker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/deploy-portainer.yml b/templates/deploy-portainer.yml index aa67ffd..af4d05c 100644 --- a/templates/deploy-portainer.yml +++ b/templates/deploy-portainer.yml @@ -24,7 +24,7 @@ name: preproduction url: https://"$PREPPROD_SERVER_URL" rules: - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main"' - if: $CI_COMMIT_TAG when: never diff --git a/templates/images-docker.yml b/templates/images-docker.yml index b6cf7e4..92988ae 100644 --- a/templates/images-docker.yml +++ b/templates/images-docker.yml @@ -11,7 +11,7 @@ extends: .build-docker stage: push rules: - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main"' - if: $CI_COMMIT_TAG when: never variables: -- GitLab