diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 722244639c9930770405b8564c84909bb12680b8..ac71ad89a1b66dd7377f72477014257dc312a836 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ variables: _TARGET_PHP: "8.2" COMPOSER: composer.json # Let composer know what self.version means. - COMPOSER_ROOT_VERSION: "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}-dev" + COMPOSER_ROOT_VERSION: "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_BRANCH}-dev" CONCURRENCY: 32 ################ diff --git a/.gitlab-ci/pipeline.yml b/.gitlab-ci/pipeline.yml index 77009bf197b29ea3d035ddff6644e78e6bf03e46..1bdae7bf0c9834c8f24409547c8d3ef12c7bc5bf 100644 --- a/.gitlab-ci/pipeline.yml +++ b/.gitlab-ci/pipeline.yml @@ -262,7 +262,7 @@ stages: stage: 🪄 Lint script: - git fetch origin - - export MODIFIED=`git diff --name-only origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}|while read r;do echo "$CI_PROJECT_DIR/$r";done|tr "\n" " "` + - export MODIFIED=`git diff --name-only origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}${CI_COMMIT_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 ################