diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac8e19c2aad05eafd3eb3da3bd92cbf704b93f32..56165198a402dfbd56d2cf4eb2ae8a723bf90058 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,6 +49,7 @@ include: # Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml ################ variables: + _TARGET_CORE: "$CORE_MINOR" SKIP_COMPOSER_LINT: '1' SKIP_ESLINT: '1' SKIP_PHPCS: '1' @@ -120,7 +121,7 @@ composer: - rm expand_composer_json.php - composer create-project --no-install drupal/recommended-project:$_TARGET_CORE ./composer/Template/RecommendedProject - composer create-project --no-install drupal/legacy-project:$_TARGET_CORE ./composer/Template/LegacyProject - - composer run core-convert --working-dir=./modules/contrib/automatic_updates -- $PWD --gitlabci --core_target_branch=10.1.x + - composer run core-convert --working-dir=./modules/contrib/automatic_updates -- $PWD --gitlabci --core_target_branch=11.x - test -d ./core/modules/package_manager - test -d ./core/modules/auto_updates - rm -r -f ./modules/contrib diff --git a/package_manager/tests/src/Kernel/SymlinkValidatorTest.php b/package_manager/tests/src/Kernel/SymlinkValidatorTest.php index 568137b3289d4cb01132736f9186ea9138e5339e..fe77dd7983fb97073d830cd049be0fb8a9bbee0c 100644 --- a/package_manager/tests/src/Kernel/SymlinkValidatorTest.php +++ b/package_manager/tests/src/Kernel/SymlinkValidatorTest.php @@ -32,10 +32,10 @@ class SymlinkValidatorTest extends PackageManagerKernelTestBase { // correctly evaluated. chdir($drush_dir . '/docs'); symlink('../drush_logo-black.png', 'drush_logo-black.png'); - // Switch back to the project root to ensure that the check isn't affected - // by which directory we happen to be in. - chdir($project_root); + // Switch back to the Drupal root to ensure that the check isn't affected + // by which directory we happen to be in. + chdir($this->getDrupalRoot()); $this->assertStatusCheckResults([]); } @@ -182,6 +182,9 @@ class SymlinkValidatorTest extends PackageManagerKernelTestBase { ->set('file_syncer', $file_syncer) ->save(); + // Switch back to the Drupal root to ensure that the check isn't affected + // by which directory we happen to be in. + chdir($this->getDrupalRoot()); $this->assertStatusCheckResults($expected_results); }