Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ACMS-4173: verify D11 compatibility. #1868

Merged
merged 15 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 44 additions & 12 deletions .github/workflows/acquia_cms_ci.workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,20 @@ 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
integrated_tests:
if: ${{ github.event_name == 'pull_request' }}
name: ${{ matrix.acms_job }} (${{ matrix.orca-job }})
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
vishalkhode1 marked this conversation as resolved.
Show resolved Hide resolved
env:
# Site test artifacts.
# ACMS_DB_ARTIFACT: "/home/runner/work/acquia_cms/acquia_cms/tests/acms.sql.gz"
Expand Down Expand Up @@ -132,7 +139,7 @@ jobs:
matrix:
orca-job:
- INTEGRATED_TEST_ON_LATEST_LTS
# - ISOLATED_TEST_ON_CURRENT
- ISOLATED_TEST_ON_CURRENT
acms_job:
- integrated_php_unit_tests
- integrated_existing_site_tests
Expand Down Expand Up @@ -164,6 +171,13 @@ 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

Expand Down Expand Up @@ -201,8 +215,8 @@ jobs:
../orca/bin/ci/after_script.sh
isolated_tests:
if: ${{ github.event_name == 'pull_request' }}
name: acquia_cms (${{ matrix.modules }})
runs-on: ubuntu-latest
name: acquia_cms (${{ matrix.modules }}) on (${{ matrix.orca-job }})
runs-on: ubuntu-24.04
vishalkhode1 marked this conversation as resolved.
Show resolved Hide resolved
env:
# Set ORCA related environment variables.
ORCA_SUT_NAME: acquia/acquia_cms
Expand Down Expand Up @@ -232,24 +246,24 @@ jobs:
matrix:
orca-job:
- INTEGRATED_TEST_ON_LATEST_LTS
# - ISOLATED_TEST_ON_CURRENT
- ISOLATED_TEST_ON_CURRENT
#php-version: [ "8.1" ]
modules:
- acquia_cms_article
- acquia_cms_audio
- acquia_cms_common
- acquia_cms_document
- acquia_cms_event
- acquia_cms_headless
# - acquia_cms_headless
- acquia_cms_image
- acquia_cms_page
- acquia_cms_person
- acquia_cms_place
- acquia_cms_search
- acquia_cms_site_studio
# - acquia_cms_site_studio
- acquia_cms_tour
- acquia_cms_video
- sitestudio_config_management
# - sitestudio_config_management
steps:
- uses: actions/checkout@v3
- name: Use Node.js 12.13.1
Expand All @@ -267,6 +281,13 @@ 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.
Expand Down Expand Up @@ -330,10 +351,13 @@ jobs:
orca-job:
- INTEGRATED_TEST_ON_LATEST_LTS
# - INTEGRATED_TEST_ON_PREVIOUS_MINOR
# - ISOLATED_TEST_ON_CURRENT
- ISOLATED_TEST_ON_CURRENT
php-version:
- 8.1
- 8.3
exclude:
- php-version: 8.1
vishalkhode1 marked this conversation as resolved.
Show resolved Hide resolved
orca-job: ISOLATED_TEST_ON_CURRENT
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.x
Expand All @@ -353,7 +377,8 @@ jobs:
composer self-update
composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
curl https://gist.githubusercontent.com/rajeshreeputra/170586f217b422eb9cdfd9ca9457a2e3/raw/c2f277ba9005b91d7f662cacf37b3940a66a9b8c/sut-path-reposories.patch | git -C ../orca apply
curl https://gist.githubusercontent.com/vishalkhode1/342a0eee801e51f48b4d9701749c1c94/raw/orca-oldest-support.patch | git -C ../orca apply
# Remove Drupal core 9.5.x as oldest support in favor of 10.3.x
# curl https://gist.githubusercontent.com/vishalkhode1/342a0eee801e51f48b4d9701749c1c94/raw/orca-oldest-support.patch | git -C ../orca apply
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
Expand All @@ -362,9 +387,16 @@ 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
# Added below in CI to test acquia_cms on Drupal Core >=9.5.
composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml
# composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common
# sed -i 's/^core_version_requirement.*/core_version_requirement: ">=9.5"/' modules/acquia_cms_common/acquia_cms_common.info.yml

# Remove all PHPunit tests from acquia_cms modules.
find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';'
Expand Down
28 changes: 22 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@
"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",
"drupal/acquia_cms_tour": "dev-develop",
"drupal/consumer_image_styles": "^4.0",
"drupal/gin": "^3.0@RC",
"drupal/google_analytics": "^4.0",
"drupal/google_analytics": "dev-3430780-automated-drupal-11",
"drupal/google_tag": "^2.0",
"drupal/honeypot": "^2.1",
"drupal/recaptcha": "^3.2",
Expand All @@ -41,9 +40,8 @@
},
"require-dev": {
"acquia/coding-standards": "^1.0",
"axelerant/drupal-quality-checker": "~1.3.0",
"drupal/core-composer-scaffold": "^9.0.0 || ^10",
"drupal/core-dev": "^9 || ^10",
"drupal/core-composer-scaffold": "^10 || ^11",
"drupal/core-dev": "^10 || ^11",
"ergebnis/composer-normalize": "^2.31.0",
"mglaman/drupal-check": "^1.4",
"oomphinc/composer-installers-extender": "^1.1 || ^2",
Expand Down Expand Up @@ -235,6 +233,22 @@
}
}
},
"acquia_dam": {
"type": "vcs",
"url": "https://git.drupalcode.org/issue/acquia_dam-3471717.git"
},
"consumer_image_styles": {
"type": "vcs",
"url": "https://git.drupalcode.org/issue/consumer_image_styles-3429496.git"
},
"google_analytics": {
"type": "vcs",
"url": "https://git.drupalcode.org/issue/google_analytics-3430780.git"
},
"config_filter": {
"type": "vcs",
"url": "https://git.drupalcode.org/issue/config_filter-3428542.git"
},
"sitestudio_gin": {
"type": "vcs",
"url": "https://git.drupalcode.org/issue/sitestudio_gin-3434617.git"
Expand Down Expand Up @@ -268,7 +282,8 @@
"phpro/grumphp-shim": true,
"phpstan/extension-installer": true,
"webdriver-binary/binary-chromedriver": true,
"wikimedia/composer-merge-plugin": true
"wikimedia/composer-merge-plugin": true,
"drupal/core-project-message": true
},
"preferred-install": {
"drupal/core": "dist"
Expand Down Expand Up @@ -305,6 +320,7 @@
}
},
"enable-patching": true,
"composer-exit-on-patch-failure": false,
apathak18 marked this conversation as resolved.
Show resolved Hide resolved
"installer-paths": {
"docroot/core": [
"type:drupal-core"
Expand Down
Loading
Loading