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

Commit 336d2860 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Update auto merge and auto update from upstream templates for Android 15

parent 1bc25547

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

+6 −0
Original line number Diff line number Diff line
@@ -66,3 +66,9 @@ auto-merge-a14: 
  variables:

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

    TARGET_BRANCH: a14



auto-merge-a15:

  extends: .auto-merge-main

  variables:

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

    TARGET_BRANCH: a15
 
 No newline at end of file

gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml

+7 −1
Original line number Diff line number Diff line
@@ -86,3 +86,9 @@ a14: 
  variables:

    UPSTREAM_BRANCH: lineage-21.0

    LOCAL_BRANCH: a14



a15:

  extends: .update-from-upstream

  variables:

    UPSTREAM_BRANCH: lineage-22.1

    LOCAL_BRANCH: a15
 
 No newline at end of file