Skip to content

Commit

Permalink
Merge pull request #1698 from acquia/feature/drupal10.2.x
Browse files Browse the repository at this point in the history 
Merge `feature/drupal10.2.x` into `develop`
  • Loading branch information
@vishalkhode1
vishalkhode1 authored Dec 11, 2023
2 parents 5911c3b + 1b24eff commit 868c3b1
Show file tree
Hide file tree
Showing 6 changed files with 557 additions and 501 deletions.
75 changes: 24 additions & 51 deletions .github/workflows/acquia_cms_ci.workflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ jobs:
../orca/bin/ci/after_success.sh
../orca/bin/ci/after_failure.sh
../orca/bin/ci/after_script.sh
drupal_check:
if: ${{ github.event_name == 'pull_request' }}
name: Execute Drupal-check
Expand Down Expand Up @@ -136,7 +135,7 @@ jobs:
fail-fast: false
matrix:
orca-job:
- ISOLATED_TEST_ON_CURRENT
- ISOLATED_TEST_ON_NEXT_MINOR
#php-version: [ "8.1" ]
acms_job:
- integrated_php_unit_tests
Expand Down Expand Up @@ -172,6 +171,11 @@ jobs:
composer require "drupal/facets:^2.0.6" --no-update --no-install -d modules/acquia_cms_search
composer require "drupal/pathauto:^1.11" --no-update --no-install -d modules/acquia_cms_common
if [ "${ORCA_JOB}" = "ISOLATED_TEST_ON_CURRENT" ]; then
# Update drupal/core patch as per Drupal Core version.
sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json
fi
# 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
Expand Down Expand Up @@ -240,37 +244,12 @@ jobs:
fail-fast: false
matrix:
orca-job:
- ISOLATED_TEST_ON_CURRENT
- INTEGRATED_TEST_ON_LATEST_LTS
- ISOLATED_TEST_ON_NEXT_MINOR
php-version:
- 7.4
- 8.1
- 8.2
orca-version:
- ^3
- ^4
exclude:
- orca-job: ISOLATED_TEST_ON_CURRENT
orca-version: ^3
php-version: 7.4
- orca-job: ISOLATED_TEST_ON_CURRENT
orca-version: ^3
php-version: 8.1
- orca-job: ISOLATED_TEST_ON_CURRENT
orca-version: ^3
php-version: 8.2
- orca-job: ISOLATED_TEST_ON_CURRENT
orca-version: ^4
php-version: 7.4
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
orca-version: ^3
php-version: 8.1
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
orca-version: ^3
php-version: 8.2
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
orca-version: ^4
php-version: 7.4
steps:
- uses: actions/checkout@v3
- name: Use Node.js 12.13.1
Expand Down Expand Up @@ -306,27 +285,11 @@ jobs:
# Remove all PHPunit tests from acquia_cms modules.
find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';'
# Remove the failing php on Drupal Core 9.5.
if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_LATEST_LTS" ]; then
# NEW_JSON=$(composer config extra.patches."drupal/core" | sed -r 's/,?"3328187.*3142.patch"//')
# Remove drupal/core patch as it's needed for latest Drupal Core only.
composer config extra.patches.drupal/core {} --json
sed -i 's/2598.patch",/2599.patch"/' modules/acquia_cms_common/composer.json
sed -i '/3356894-mr_3896.patch/d' modules/acquia_cms_common/composer.json
sed -i '/296693-10.1.x_0.patch/d' modules/acquia_cms_common/composer.json
sed -i '/3165269bb01a5a8e5f53c1f369135b967c9d5924.patch/d' modules/acquia_cms_common/composer.json
sed -i '/3370946-page-title-backport-10-1-x.patch/d' modules/acquia_cms_common/composer.json
sed -i '/10.1-3347291-combine-mega-e.patch/d' modules/acquia_cms_common/composer.json
# Change requireSameDimensions to true in backstop settings.
sed -i '54s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
sed -i '111s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
sed -i '130s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
sed -i '149s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
sed -i '168s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
sed -i '187s/"requireSameDimensions": true/"requireSameDimensions": false/' tests/backstop/backstop-settings.js
if [ "${ORCA_JOB}" = "ISOLATED_TEST_ON_CURRENT" ]; then
# Update drupal/core patch as per Drupal Core version.
sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json
fi
../orca/bin/ci/before_install.sh
chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 &
CHROMEDRIVER_PID=$!
Expand Down Expand Up @@ -379,7 +342,7 @@ jobs:
fail-fast: false
matrix:
orca-job:
- ISOLATED_TEST_ON_CURRENT
- ISOLATED_TEST_ON_NEXT_MINOR
#php-version: [ "8.1" ]
modules:
- acquia_cms_article, acquia_cms_person, acquia_cms_place, acquia_cms_event
Expand Down Expand Up @@ -425,6 +388,11 @@ jobs:
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
if [ "${ORCA_JOB}" = "ISOLATED_TEST_ON_CURRENT" ]; then
# Update drupal/core patch as per Drupal Core version.
sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json
fi
modules_list=$(echo ${MODULES} | tr "," "\n")
declare -a commands
for module in ${modules_list}
Expand Down Expand Up @@ -484,7 +452,7 @@ jobs:

GIT_COMMITTER_NAME: "Github Actions"
GIT_COMMITTER_EMAIL: "[email protected]"
ORCA_JOB: ISOLATED_TEST_ON_CURRENT
ORCA_JOB: ISOLATED_TEST_ON_NEXT_MINOR
ACMS_JOB: "upgrade_modules"
strategy:
fail-fast: false
Expand Down Expand Up @@ -513,6 +481,12 @@ jobs:
# 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
if [ "${ORCA_JOB}" = "ISOLATED_TEST_ON_CURRENT" ]; then
# Update drupal/core patch as per Drupal Core version.
sed -i 's/2023-11-30\/3370946-pagetitle-backport-10-2-x.patch/2023-09-11\/3370946-page-title-backport-10-1-x.patch/g' modules/acquia_cms_common/composer.json
fi
./tests/ci/before_install.blt.sh
- name: Install
shell: 'script -q -e -c "bash {0}"'
Expand All @@ -535,7 +509,6 @@ jobs:
./vendor/bin/drush cr
cd ${ORCA_SUT_DIR}
./tests/ci/script.sh
deploy_code:
if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
name: "Continuous Deployment (CD)"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/acquia_cms_cron.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ jobs:
composer self-update
composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
curl https://gist.githubusercontent.com/vishalkhode1/0e26b2e9637722a256c74a6cb8496e9d/raw/sut-path-reposories.patch | git -C ../orca apply
curl https://gist.githubusercontent.com/vishalkhode1/342a0eee801e51f48b4d9701749c1c94/raw/orca-oldest-support.patch | git -C ../orca apply
- name: Before Install
run: |
# Added below in CI to test acquia_cms on Drupal Core >=9.5.
Expand Down Expand Up @@ -366,6 +367,7 @@ jobs:
composer self-update
composer create-project --no-dev --ignore-platform-req=php acquia/orca ../orca "$ORCA_VERSION" -n
curl https://gist.githubusercontent.com/vishalkhode1/0e26b2e9637722a256c74a6cb8496e9d/raw/sut-path-reposories.patch | git -C ../orca apply
curl https://gist.githubusercontent.com/vishalkhode1/342a0eee801e51f48b4d9701749c1c94/raw/orca-oldest-support.patch | git -C ../orca apply
- name: Before Install
run: |
# Added below in CI to test acquia_cms on Drupal Core >=9.5.
Expand Down
Loading

0 comments on commit 868c3b1

Please sign in to comment.