Commit f369d78f authored by catch's avatar catch
Browse files

Issue #3412415 by larowlan, fjgarlin, longwave, drumm, benjifisher: Make CI... 

Issue #3412415 by larowlan, fjgarlin, longwave, drumm, benjifisher: Make CI template compatible with private repositories

(cherry picked from commit 411e0bba)
parent b6911a67

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -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

.gitlab-ci/scripts/test-only.sh

+1 −1
Original line number Diff line number Diff line 
#!/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