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

Commit a784a8b0 authored by Jackeagle's avatar Jackeagle
Browse files

Merge branch 'Jackeagle-master-patch-41143' into 'master' 

auto-merge-main: Add support for v1-u

See merge request e/templates!41
parents e314422c d0b5706a

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

+7 −1
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ auto-merge-t: 
    TARGET_BRANCH: v1-t



auto-merge-u:

  extends: .auto-merge-main

  variables:

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

    TARGET_BRANCH: v1-u



auto-merge-a14:

  extends: .auto-merge-main

  variables:

    BRANCH_NAME_REGEX: /^v[0-9]{1}-(u)$/