From 28b798debe30b3b698839b067677411caacdb32c Mon Sep 17 00:00:00 2001 From: James Wilson Date: Thu, 12 Aug 2021 12:57:03 +0100 Subject: [PATCH] Fix gitlab CI to run on master and auto build/deploy to staging on merge to master --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 220f993..0840b6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,8 +17,8 @@ stages: stage: dockerize image: quay.io/buildah/stable rules: - - if: '$CI_COMMIT_BRANCH == "jsdw-sharding"' - when: manual + - if: '$CI_COMMIT_BRANCH == "master"' + # when: manual # uncomment this line if we want to make this step a manual process tags: - kubernetes-parity-build @@ -54,8 +54,8 @@ stages: --set image.frontend.tag="${CI_COMMIT_SHORT_SHA}" $KUBE_NAMESPACE ./helm/ rules: - - if: '$CI_COMMIT_BRANCH == "jsdw-sharding"' - when: manual + - if: '$CI_COMMIT_BRANCH == "master"' + # when: manual # uncomment this line if we want to make this step a manual process tags: - kubernetes-parity-build