From 1fa798ac753a0ba245ba235750c6e38c7b55a14e Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Wed, 13 Sep 2023 12:56:02 +0100
Subject: [PATCH] Issue #3386680 by longwave, fjgarlin: Run jobs on GitLab CI
 branch tests

---
 .gitlab-ci.yml          | 2 +-
 .gitlab-ci/pipeline.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 722244639c99..ac71ad89a1b6 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 77009bf197b2..1bdae7bf0c98 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
 
 ################
-- 
GitLab