diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml index 03510530f..b2163771f 100644 --- a/.github/workflows/acquia_cms_ci.workflow.yml +++ b/.github/workflows/acquia_cms_ci.workflow.yml @@ -55,12 +55,7 @@ jobs: curl https://gist.githubusercontent.com/vishalkhode1/0e26b2e9637722a256c74a6cb8496e9d/raw/sut-path-reposories.patch | git -C ../orca apply curl https://gist.githubusercontent.com/chandan-singh7929/902a17bbf0f5c0e0ee536dd5983875f3/raw/4031ae76ca5e8f08b98545bfdcda327f6d38be58/remove-local-settings.patch | git -C ../orca apply - name: Before Install - run: | - # 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 - - ../orca/bin/ci/before_install.sh + run: ../orca/bin/ci/before_install.sh - name: Install shell: 'script -q -e -c "bash {0}"' run: ./tests/ci/install.sh @@ -167,10 +162,6 @@ jobs: # 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 - # 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 - # Remove all PHPUnit tests from individual modules, except the integrated & ExistingSite tests. if [ "${ACMS_JOB}" = "integrated_existing_site_tests" ]; then find modules/*/tests tests -type f -name "*Test.php" ! -path "*/ExistingSite*/*" -exec rm -fr '{}' ';' @@ -269,8 +260,9 @@ jobs: - name: Before Install run: | # 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 + sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json + composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common # Remove all PHPunit tests from acquia_cms modules. find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';' @@ -355,9 +347,7 @@ jobs: curl https://gist.githubusercontent.com/chandan-singh7929/902a17bbf0f5c0e0ee536dd5983875f3/raw/4031ae76ca5e8f08b98545bfdcda327f6d38be58/remove-local-settings.patch | git -C ../orca apply - name: Before Install run: | - # 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" --no-update --no-install -d modules/acquia_cms_common ./tests/ci/before_install.blt.sh - name: Install shell: 'script -q -e -c "bash {0}"' diff --git a/.github/workflows/acquia_cms_cron.yml b/.github/workflows/acquia_cms_cron.yml index 80fa9700f..d9daab240 100644 --- a/.github/workflows/acquia_cms_cron.yml +++ b/.github/workflows/acquia_cms_cron.yml @@ -54,8 +54,9 @@ jobs: - name: Before Install run: | # 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 + sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json + composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common ../orca/bin/ci/before_install.sh - name: Install shell: 'script -q -e -c "bash {0}"' @@ -109,8 +110,9 @@ jobs: - name: Before Install run: | # 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 + sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json + composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common # One of the patch is failing on Drupal Core 9.5. So remove that patch. if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_LATEST_LTS" ]; then @@ -205,8 +207,9 @@ jobs: - name: Before Install run: | # 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 + sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json + composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_LATEST_LTS" ]; then # NEW_JSON=$(composer config extra.patches."drupal/core" | sed -r 's/,?"3328187.*3142.patch"//') @@ -291,8 +294,9 @@ jobs: - name: Before Install run: | # 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 + sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json + composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common ../orca/bin/ci/before_install.sh - name: Install @@ -364,8 +368,9 @@ jobs: - name: Before Install run: | # 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 + sed -i 's/"drupal\/core": "^10.2.2"/"drupal\/core": ">=9.5"/' modules/acquia_cms_common/composer.json + composer require "drupal/core:>=9.5" --no-update --no-install -d modules/acquia_cms_common # 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 index 0c24deb0c..6bd559ea7 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "drupal/sitestudio_gin": "^1.0", "drush/drush": "^10 || ^11 || ^12", "mnsami/composer-custom-directory-installer": "^2.0", - "nnnick/chartjs": "^4.4" + "nnnick/chartjs": "^3.9 || ^4.4" }, "require-dev": { "acquia/coding-standards": "^1.0", diff --git a/composer.lock b/composer.lock index 23ed9c8c2..2460610e6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1ba6a6750134ed7357151468b42bbbec", + "content-hash": "19a96f677dbc9cd8b0ca7ca3f8941bac", "packages": [ { "name": "acquia/acquia-cms-starterkit", @@ -4655,6 +4655,10 @@ "homepage": "https://www.drupal.org/u/realityloop", "role": "Maintainer" }, + { + "name": "Junyor", + "homepage": "https://www.drupal.org/user/7006" + }, { "name": "lhangea", "homepage": "https://www.drupal.org/user/2743803" @@ -6448,7 +6452,7 @@ "extra": { "drupal": { "version": "2.0.0-rc1", - "datestamp": "1709827834", + "datestamp": "1709827878", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -6875,7 +6879,7 @@ "extra": { "drupal": { "version": "8.x-1.12", - "datestamp": "1696776683", + "datestamp": "1712319355", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -21671,5 +21675,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" }