diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acdc3c28300a72a64d6cf6caead103d2dce3bf30..5e2552e1a223e4f7167129abb69199d235c4d994 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -412,6 +412,6 @@ default: KUBERNETES_CPU_REQUEST: "2" script: - export TARGET_BRANCH=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH} - - git fetch -vn --depth=$GIT_DEPTH "${CI_MERGE_REQUEST_PROJECT_URL:-origin}" "+refs/heads/$TARGET_BRANCH:refs/heads/$TARGET_BRANCH" + - git fetch -vn --depth=$GIT_DEPTH origin "+refs/heads/$TARGET_BRANCH:refs/heads/$TARGET_BRANCH" - export MODIFIED=`git diff --name-only refs/heads/$TARGET_BRANCH|while read r;do echo "$CI_PROJECT_DIR/$r";done|tr "\n" " "` - echo $MODIFIED | tr ' ' '\n' | yarn --cwd=./core run -s spellcheck:core --no-must-find-files --file-list stdin diff --git a/.gitlab-ci/scripts/test-only.sh b/.gitlab-ci/scripts/test-only.sh index 6e49f9de8f922cbe29c71e1a6e39a0aef51a89e0..f54b8b05d77c134a73eb5dd006574333279b61f7 100755 --- a/.gitlab-ci/scripts/test-only.sh +++ b/.gitlab-ci/scripts/test-only.sh @@ -1,7 +1,7 @@ #!/bin/bash export TARGET_BRANCH=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH} -git fetch -vn --depth=50 "$CI_MERGE_REQUEST_PROJECT_URL" "+refs/heads/$TARGET_BRANCH:refs/heads/$TARGET_BRANCH" +git fetch -vn --depth=50 origin "+refs/heads/$TARGET_BRANCH:refs/heads/$TARGET_BRANCH" echo "â„¹ï¸ Changes from ${TARGET_BRANCH}" git diff ${CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only