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

Commit 5e1c8c35 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

ci(update-from-upstream): rebase main-ose-rebased on upstream main

parent 281e1fc9
Loading
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ update-from-upstream:
  stage: update-from-upstream
  image: registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:slim-latest
  rules:
    - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_REF_NAME == "main-ose"'
    - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_REF_NAME == "main-ose-rebased"'
  before_script:
    - eval "$(ssh-agent -s)"
    - echo "$SSH_E_ROBOT_PRIVATE_KEY" | tr -d '\r' | ssh-add -
@@ -61,9 +61,8 @@ update-from-upstream:
    - git config --global user.name "$GITLAB_USER_NAME"
  script:
    - git clone git@gitlab.e.foundation:$CI_PROJECT_PATH repo && cd repo
    - git checkout main-ose
    - git remote add upstream https://github.com/bitfireAT/davx5-ose
    - git fetch upstream --tags --prune --force
    - LATEST_TAG=$(git ls-remote --tags upstream | awk -F/ '{print $NF}' | grep -v '{}' | sort -Vr | head -n1)
    - git merge --no-edit "refs/tags/$LATEST_TAG"
    - git push origin main-ose
    - git checkout main-ose-rebased
    - git remote add upstream https://github.com/bitfireAT/davx5-ose || true
    - git fetch upstream main --prune --force
    - git rebase upstream/main
    - git push --force-with-lease origin main-ose-rebased