Loading .gitlab-ci.yml +27 −10 Original line number Diff line number Diff line stages: - auto-merge-main - update-from-upstream variables: CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH include: - project: 'e/templates' ref: master file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml' - project: 'e/templates' ref: master file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' update-from-upstream: image: registry.gitlab.e.foundation/e/tools/docker-tools:latest rules: - if: '$CI_COMMIT_BRANCH == "v1-a15-FP6"' variables: GIT_STRATEGY: none before_script: - eval $(ssh-agent -s) - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh - chmod 700 ~/.ssh - echo "${SSH_KNOWN_HOSTS}" > /root/.ssh/known_hosts - echo "${SSH_KNOWN_HOSTS}" - chmod 644 ~/.ssh/known_hosts - git config --global user.email $GITLAB_USER_EMAIL - git config --global user.name "$GITLAB_USER_NAME" - cd $CI_BUILD_DIR - rm -rf $CI_PROJECT_DIR - git clone $CI_PROJECT_SSH_URL $CI_PROJECT_DIR - cd $CI_PROJECT_DIR script: - git fetch origin - git checkout v1-a15-FP6 - git merge origin/a15 - git push Loading
.gitlab-ci.yml +27 −10 Original line number Diff line number Diff line stages: - auto-merge-main - update-from-upstream variables: CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH include: - project: 'e/templates' ref: master file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml' - project: 'e/templates' ref: master file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' update-from-upstream: image: registry.gitlab.e.foundation/e/tools/docker-tools:latest rules: - if: '$CI_COMMIT_BRANCH == "v1-a15-FP6"' variables: GIT_STRATEGY: none before_script: - eval $(ssh-agent -s) - echo "${SSH_E_ROBOT_PRIVATE_KEY}" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh - chmod 700 ~/.ssh - echo "${SSH_KNOWN_HOSTS}" > /root/.ssh/known_hosts - echo "${SSH_KNOWN_HOSTS}" - chmod 644 ~/.ssh/known_hosts - git config --global user.email $GITLAB_USER_EMAIL - git config --global user.name "$GITLAB_USER_NAME" - cd $CI_BUILD_DIR - rm -rf $CI_PROJECT_DIR - git clone $CI_PROJECT_SSH_URL $CI_PROJECT_DIR - cd $CI_PROJECT_DIR script: - git fetch origin - git checkout v1-a15-FP6 - git merge origin/a15 - git push