Loading .gitlab-ci.yml +6 −7 Original line number Diff line number Diff line Loading @@ -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 - Loading @@ -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 Loading
.gitlab-ci.yml +6 −7 Original line number Diff line number Diff line Loading @@ -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 - Loading @@ -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