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

Commit 1649dff3 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge remote-tracking branch 'origin/v3.7'

parents c169d334 ebfe0676
Loading
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -9,10 +9,22 @@ variables:
  TEST_APK: "Account_manager_test.apk"

stages:
  - auto-merge-main
  - update-from-upstream
  - build
  - gitlab_release

include:
  - project: "e/templates"
    ref: main
    file: "/.gitlab/gitlab-ci/gitlab-ci-auto-merge-main.yml"

auto_merge_main:
  extends: .auto-merge-main
  variables:
    BRANCH_NAME_REGEX: /^v[0-9](\.[0-9]*){1,2}$/
    TARGET_BRANCH: main

before_script:
  - echo email.key=$PEPPER >> local.properties
  - echo MURENA_CLIENT_ID=$MURENA_CLIENT_ID >> local.properties