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

Commit a8405401 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '3597-main-pipeline' into 'main' 

Add support for a16

See merge request e/templates!51
parents 3851f18f de035a71

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

+8 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ variables: 
  CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH



.auto-merge-main:

  image: registry.gitlab.e.foundation/e/tools/docker-tools:latest

  image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:slim-latest

  stage: auto-merge-main

  rules:

    - if: '$CI_COMMIT_REF_NAME =~ $BRANCH_NAME_REGEX'
@@ -17,7 +17,6 @@ variables: 
  variables:

    GIT_STRATEGY: none

  before_script:

    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'

    - eval $(ssh-agent -s)

    - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null

    - mkdir -p ~/.ssh
@@ -72,3 +71,9 @@ auto-merge-a15: 
  variables:

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

    TARGET_BRANCH: a15



auto-merge-a16:

  extends: .auto-merge-main

  variables:

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

    TARGET_BRANCH: a16

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

+13 −2
Original line number Diff line number Diff line
@@ -6,14 +6,13 @@ variables: 
  CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH



.update-from-upstream:

  image: registry.gitlab.e.foundation/e/tools/docker-tools:latest

  image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:slim-latest

  stage: update-from-upstream

  rules:

    - if: '$CI_PIPELINE_SOURCE =~ /schedule/ && $CI_COMMIT_REF_NAME == $LOCAL_BRANCH'

  variables:

    GIT_STRATEGY: none

  before_script:

    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'

    - eval $(ssh-agent -s)

    - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null

    - mkdir -p ~/.ssh
@@ -44,3 +43,15 @@ a14: 
  variables:

    UPSTREAM_BRANCH: lineage-21

    LOCAL_BRANCH: a14



a15:

  extends: .update-from-upstream

  variables:

    UPSTREAM_BRANCH: lineage-22.2

    LOCAL_BRANCH: a15



a16:

  extends: .update-from-upstream

  variables:

    UPSTREAM_BRANCH: lineage-23.0

    LOCAL_BRANCH: a16

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

+8 −3
Original line number Diff line number Diff line
@@ -6,14 +6,13 @@ variables: 
  CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH



.update-from-upstream:

  image: registry.gitlab.e.foundation/e/tools/docker-tools:latest

  image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:slim-latest

  stage: update-from-upstream

  rules:

    - if: '$CI_PIPELINE_SOURCE =~ /schedule/ && $CI_COMMIT_REF_NAME == $LOCAL_BRANCH'

  variables:

    GIT_STRATEGY: none

  before_script:

    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'

    - eval $(ssh-agent -s)

    - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null

    - mkdir -p ~/.ssh
@@ -92,3 +91,9 @@ a15: 
  variables:

    UPSTREAM_BRANCH: lineage-22.2

    LOCAL_BRANCH: a15



a16:

  extends: .update-from-upstream

  variables:

    UPSTREAM_BRANCH: lineage-23.0

    LOCAL_BRANCH: a16