diff options
Diffstat (limited to '.gitlab/ci/as-if-jh.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/as-if-jh.gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci/as-if-jh.gitlab-ci.yml b/.gitlab/ci/as-if-jh.gitlab-ci.yml index 6019c8a9649..6bd46bee770 100644 --- a/.gitlab/ci/as-if-jh.gitlab-ci.yml +++ b/.gitlab/ci/as-if-jh.gitlab-ci.yml @@ -10,7 +10,7 @@ add-jh-files: extends: - .shared-as-if-jh - .as-if-jh:rules:prepare-as-if-jh - image: ${GITLAB_DEPENDENCY_PROXY}ruby:${RUBY_VERSION} + image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION} stage: prepare before_script: - source ./scripts/utils.sh @@ -38,12 +38,12 @@ prepare-as-if-jh-branch: needs: - add-jh-files script: + # Fetch for the history of the branch so it does not cause the following error: + # ! [remote rejected] ref -> ref (shallow update not allowed) + - git fetch --unshallow --filter=tree:0 origin "${CI_COMMIT_SHA}" - git checkout -b "${AS_IF_JH_BRANCH}" - git add ${JH_FILES_TO_COMMIT} - git commit -m 'Add JH files' # TODO: Mark which SHA we add - # Fetch for the history of the branch so it does not cause the following error: - # ! [remote rejected] ref -> ref (shallow update not allowed) - - git fetch --unshallow --filter=tree:0 origin "${CI_COMMIT_REF_NAME}" - git push -f "${SANDBOX_REPOSITORY}" "${AS_IF_JH_BRANCH}" start-as-if-jh: |