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

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

Add upstream support for AOSP & QPR

parent bb38cb9b
Loading
Loading
Loading
Loading
+32 −4
Original line number Diff line number Diff line
@@ -27,10 +27,26 @@ variables:
    - git clone $CI_PROJECT_SSH_URL $CI_PROJECT_DIR
    - cd $CI_PROJECT_DIR
  script:
    - git fetch origin
    - git checkout $CI_COMMIT_REF_NAME
    - git merge origin/$UPSTREAM_BRANCH
    - git push
    - |
      set -e

      git fetch origin --tags
      git checkout "$CI_COMMIT_REF_NAME"

      if git show-ref --verify --quiet "refs/remotes/origin/$UPSTREAM_BRANCH"; then
        echo "Merging upstream branch: origin/$UPSTREAM_BRANCH -> $CI_COMMIT_REF_NAME"
        git merge "origin/$UPSTREAM_BRANCH"
      else
        TAG=$(
          curl -s "https://gitlab.e.foundation/e/os/android/-/raw/$LOCAL_BRANCH/default.xml" |
          xmlstarlet sel -T -t -m '/manifest/remote[@name="aosp"]/@revision' -v . |
          awk -F/ '{print $NF}'
        )
        echo "Upstream branch not found. Merging AOSP tag: $TAG -> $CI_COMMIT_REF_NAME"
        git merge "refs/tags/$TAG"
      fi

      git push

nougat:
  extends: .update-from-upstream
@@ -97,3 +113,15 @@ a16:
  variables:
    UPSTREAM_BRANCH: lineage-23.0
    LOCAL_BRANCH: a16

a16.1:
  extends: .update-from-upstream
  variables:
    UPSTREAM_BRANCH: lineage-23.1
    LOCAL_BRANCH: a16.1

a16.2:
  extends: .update-from-upstream
  variables:
    UPSTREAM_BRANCH: lineage-23.2
    LOCAL_BRANCH: a16.2