Commit 2763cc00 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Soporta ramas estables llamadas "main"

See merge request redmic-project/gitlab-ci-templates!76
parents 145f45d4 e2686deb

deployment-external-service/_base.yml

+4 −2
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ 
    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

          $CI_COMMIT_BRANCH == "master" ||

          $CI_COMMIT_BRANCH == "main"

      when: never

    - if: $CI_COMMIT_BRANCH

      when: manual
@@ -102,7 +103,8 @@ 
          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"

    - if: $CI_COMMIT_BRANCH == "master" ||

          $CI_COMMIT_BRANCH == "main"

      when: manual

      allow_failure: true

deployment-functional-unit.yml

+4 −2
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ include: 
    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

          $CI_COMMIT_BRANCH == "master" ||

          $CI_COMMIT_BRANCH == "main"

      when: never

    - if: $CI_COMMIT_BRANCH

      when: manual
@@ -40,7 +41,8 @@ deploy-view-support-branch-development: 
          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"

    - if: $CI_COMMIT_BRANCH == "master" ||

          $CI_COMMIT_BRANCH == "main"

      when: manual

      allow_failure: true

deployment.yml

+4 −2
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ include: 
    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

          $CI_COMMIT_BRANCH == "master" ||

          $CI_COMMIT_BRANCH == "main"

      when: never

    - if: $CI_COMMIT_BRANCH

      when: manual
@@ -22,7 +23,8 @@ deploy-support-branch-development: 
          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"

    - if: $CI_COMMIT_BRANCH == "master" ||

          $CI_COMMIT_BRANCH == "main"

      when: manual

      allow_failure: true

packaging.yml

+4 −2
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ docker-build-support-branch: 
    - if: $CI_MERGE_REQUEST_ID ||

          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule" ||

          $CI_COMMIT_BRANCH == "master"

          $CI_COMMIT_BRANCH == "master" ||

          $CI_COMMIT_BRANCH == "main"

      when: never

    - if: $CI_COMMIT_BRANCH
@@ -19,7 +20,8 @@ docker-build-stable-branch: 
          $CI_COMMIT_TAG ||

          $CI_PIPELINE_SOURCE == "schedule"

      when: never

    - if: $CI_COMMIT_BRANCH == "master"

    - if: $CI_COMMIT_BRANCH == "master" ||

          $CI_COMMIT_BRANCH == "main"



docker-build-tag:

  extends: .docker-build