Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a60147f authored by Jackeagle's avatar Jackeagle
Browse files

Revert "auto-merge: Add branch filter rules" 

This reverts commit 2f8f6410.
parent 2f8f6410

gitlab-ci/.gitlab-ci-auto-merge-main.yml

+0 −6
Original line number Original line Diff line number Diff line
@@ -45,21 +45,15 @@ r: 
  variables:

  variables:

    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}-(r)$/

    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}-(r)$/

    TARGET_BRANCH: v1-r

    TARGET_BRANCH: v1-r

  rules:

    - if: '$CI_COMMIT_REF_NAME =~ /^v2\..*-r$/'





s:

s:

  extends: .auto-merge-main

  extends: .auto-merge-main

  variables:

  variables:

    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}-(s)$/

    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}-(s)$/

    TARGET_BRANCH: v1-s

    TARGET_BRANCH: v1-s

  rules:

    - if: '$CI_COMMIT_REF_NAME =~ /^v2\..*-s$/'





t:

t:

  extends: .auto-merge-main

  extends: .auto-merge-main

  variables:

  variables:

    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}-(t)$/

    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}-(t)$/

    TARGET_BRANCH: v1-t
 
    TARGET_BRANCH: v1-t
 
  rules:

    - if: '$CI_COMMIT_REF_NAME =~ /^v2\..*-t$/'