Loading .gitlab-ci.yml 0 → 100644 +28 −0 Original line number Diff line number Diff line spec: inputs: upstream: description: The upstream repository to pull changes from default: https://gitlab.com/HiPhish/jinja.vim.git branch: description: The branch in the upstream repository to fetch default: master --- workflow: rules: - if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "web" Merge: image: name: docker.io/alpine/git:latest entrypoint: ["/bin/sh", "-c"] script: - git fetch "$[[ inputs.upstream ]]" "$[[ inputs.branch ]]:upstream/$[[ inputs.branch ]]" - git merge -Xours --no-ff -m "Merge upstream changes" "upstream/$[[ inputs.branch ]]" - git push ${CI_PROJECT_URL/:\/\//:\/\/gitlab-ci-token:${CI_JOB_TOKEN}@} HEAD:${CI_COMMIT_REF_NAME} Loading
.gitlab-ci.yml 0 → 100644 +28 −0 Original line number Diff line number Diff line spec: inputs: upstream: description: The upstream repository to pull changes from default: https://gitlab.com/HiPhish/jinja.vim.git branch: description: The branch in the upstream repository to fetch default: master --- workflow: rules: - if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "web" Merge: image: name: docker.io/alpine/git:latest entrypoint: ["/bin/sh", "-c"] script: - git fetch "$[[ inputs.upstream ]]" "$[[ inputs.branch ]]:upstream/$[[ inputs.branch ]]" - git merge -Xours --no-ff -m "Merge upstream changes" "upstream/$[[ inputs.branch ]]" - git push ${CI_PROJECT_URL/:\/\//:\/\/gitlab-ci-token:${CI_JOB_TOKEN}@} HEAD:${CI_COMMIT_REF_NAME}