Merge pull request #1894 from acquia/stage

Merge branch `stage` into `main`
acquia · Oct 14, 2024 · e38cb37 · e38cb37
2 parents 48bd2ff + 31ffa24
commit e38cb37
Show file tree

Hide file tree

Showing 6 changed files with 4,433 additions and 2,363 deletions.
diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml
@@ -88,13 +88,6 @@ jobs:
           #coverage: xdebug
       - name: Execute PHPStan
         run: |
-          # Remove Acquia CMS modules.
-          # @todo: Remove module from below which you want to make Drupal 11 compatible.
-          composer remove "drupal/acquia_cms_headless" --no-install --no-update
-          # Remove acquia_cms_headless module.
-          rm -fr modules/acquia_cms_headless
-          # Unset the repository path.
-          composer config repositories.acquia_cms_headless --unset
           rm composer.lock
           composer install
           ./vendor/bin/phpstan analyze
@@ -166,13 +159,6 @@ jobs:
       #     aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
       - name: Before Install
         run: |
-          # Remove Acquia CMS modules.
-          # @todo: Remove module from below which you want to make Drupal 11 compatible.
-          composer remove "drupal/acquia_cms_headless" --no-install --no-update
-          # Remove acquia_cms_headless module.
-          rm -fr modules/acquia_cms_headless
-          # Unset the repository path.
-          composer config repositories.acquia_cms_headless --unset
           # Update the CI by adding patches without pinning the following modules.
           #composer require "drupal/facets:^2.0.6" --no-update --no-install -d modules/acquia_cms_search
 
@@ -245,7 +231,7 @@ jobs:
           - acquia_cms_common
           - acquia_cms_document
           - acquia_cms_event
-          # - acquia_cms_headless
+          - acquia_cms_headless
           - acquia_cms_image
           - acquia_cms_page
           - acquia_cms_person
@@ -271,13 +257,6 @@ jobs:
           curl https://gist.githubusercontent.com/rajeshreeputra/170586f217b422eb9cdfd9ca9457a2e3/raw/c2f277ba9005b91d7f662cacf37b3940a66a9b8c/sut-path-reposories.patch | git -C ../orca apply
       - name: Before Install
         run: |
-          # Remove Acquia CMS modules.
-          # @todo: Remove module from below which you want to make Drupal 11 compatible.
-          composer remove "drupal/acquia_cms_headless" --no-install --no-update
-          # Remove acquia_cms_headless module.
-          rm -fr modules/acquia_cms_headless
-          # Unset the repository path.
-          composer config repositories.acquia_cms_headless --unset
           # Remove all ExistingSite test in CI.
           find tests/src -type f -name "*Test.php" -path "*/ExistingSite*/*" -exec rm -fr '{}' ';'
           # Remove all PHPUnit test files, excluding the current module's PHPUnit tests.
@@ -375,14 +354,6 @@ jobs:
           aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
       - name: Before Install
         run: |
-          # Remove Acquia CMS modules.
-          # @todo: Remove module from below which you want to make Drupal 11 compatible.
-          composer remove "drupal/acquia_cms_headless" --no-install --no-update
-          # Remove acquia_cms_headless module.
-          rm -fr modules/acquia_cms_headless
-          # Unset the repository path.
-          composer config repositories.acquia_cms_headless --unset
-
           # Remove all PHPunit tests from acquia_cms modules.
           find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';'
 

diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "drupal/acquia_cms_audio": "dev-develop",
         "drupal/acquia_cms_component": "dev-develop",
         "drupal/acquia_cms_dam": "dev-develop",
+        "drupal/acquia_cms_headless": "dev-develop",
         "drupal/acquia_cms_site_studio": "dev-develop",
         "drupal/acquia_cms_starter": "dev-develop",
         "drupal/acquia_cms_toolbar": "dev-develop",
@@ -264,7 +265,8 @@
             "phpro/grumphp-shim": true,
             "phpstan/extension-installer": true,
             "webdriver-binary/binary-chromedriver": true,
-            "wikimedia/composer-merge-plugin": true
+            "wikimedia/composer-merge-plugin": true,
+            "tbachert/spi": true
         },
         "preferred-install": {
             "drupal/core": "dist"