From 762026a5add199c5cf33438183b434b198f610a3 Mon Sep 17 00:00:00 2001 From: 1O <2408212-1O@users.noreply.gitlab.com> Date: Mon, 5 Apr 2021 18:33:54 +0200 Subject: [PATCH] master to main --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df5657b..e9a5324 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,11 +53,11 @@ push_readme: -e PUSHRM_TARGET=docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO chko/docker-pushrm rules: - - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master" + - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "main" changes: - README.md -build_master: +build_main: <<: *docker_build script: - *docker_login @@ -71,7 +71,7 @@ build_master: #- docker push "$IMAGE_NAME" #- docker push "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG:-latest}" rules: - - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_TAG' + - if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_TAG' changes: - Dockerfile - backup.sh @@ -88,4 +88,4 @@ build: --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" . #- docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup:${CI_COMMIT_TAG:-latest}" rules: - - if: $CI_COMMIT_BRANCH != "master" + - if: $CI_COMMIT_BRANCH != "main"