Loading gitlab-ci/.gitlab-ci-auto-merge-main.yml +10 −2 Original line number Diff line number Diff line Loading @@ -29,10 +29,18 @@ variables: - 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 - git clone $CI_PROJECT_SSH_URL $CI_PROJECT_DIR || ( ssh-keygen -R gitlab.e.foundation && ssh-keyscan -t rsa,ecdsa,ed25519 gitlab.e.foundation >> ~/.ssh/known_hosts && git clone $CI_PROJECT_SSH_URL $CI_PROJECT_DIR ) - cd $CI_PROJECT_DIR script: - git fetch origin - git fetch origin || ( ssh-keygen -R gitlab.e.foundation && ssh-keyscan -t rsa,ecdsa,ed25519 gitlab.e.foundation >> ~/.ssh/known_hosts && git fetch origin ) - git checkout $TARGET_BRANCH - git merge origin/$CI_COMMIT_REF_NAME - git push Loading Loading
gitlab-ci/.gitlab-ci-auto-merge-main.yml +10 −2 Original line number Diff line number Diff line Loading @@ -29,10 +29,18 @@ variables: - 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 - git clone $CI_PROJECT_SSH_URL $CI_PROJECT_DIR || ( ssh-keygen -R gitlab.e.foundation && ssh-keyscan -t rsa,ecdsa,ed25519 gitlab.e.foundation >> ~/.ssh/known_hosts && git clone $CI_PROJECT_SSH_URL $CI_PROJECT_DIR ) - cd $CI_PROJECT_DIR script: - git fetch origin - git fetch origin || ( ssh-keygen -R gitlab.e.foundation && ssh-keyscan -t rsa,ecdsa,ed25519 gitlab.e.foundation >> ~/.ssh/known_hosts && git fetch origin ) - git checkout $TARGET_BRANCH - git merge origin/$CI_COMMIT_REF_NAME - git push Loading