diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml index 22d7738922..961efac6eb 100644 --- a/.github/workflows/acquia_cms_ci.workflow.yml +++ b/.github/workflows/acquia_cms_ci.workflow.yml @@ -203,108 +203,108 @@ jobs: ../orca/bin/ci/after_success.sh ../orca/bin/ci/after_failure.sh ../orca/bin/ci/after_script.sh - backstop_tests: - if: ${{ github.event_name == 'pull_request' }} - name: backstop with ${{ matrix.orca-job }} on PHP ${{ matrix.php-version }} - runs-on: ubuntu-latest - env: - # Site test artifacts. - # ACMS_DB_ARTIFACT: "/home/runner/work/acquia_cms/acquia_cms/tests/acms.sql.gz" - # ACMS_FILES_ARTIFACT: "/home/runner/work/acquia_cms/acquia_cms/tests/acms-files.tar.gz" - # ACMS_STARTER_DB_ARTIFACT: "/home/runner/work/acquia_cms/acquia_cms/tests/acms-starter.sql.gz" - # ACMS_STARTER_FILES_ARTIFACT: "/home/runner/work/acquia_cms/acquia_cms/tests/acms-files-starter.tar.gz" - # Provide your package's name. - ORCA_SUT_NAME: acquia/acquia_cms - ORCA_SUT_BRANCH: develop - ORCA_VERSION: ${{ matrix.orca-version }} - ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml - ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project - ORCA_ENABLE_NIGHTWATCH: "FALSE" - ORCA_PHPCS_STANDARD: AcquiaPHP - ORCA_SUT_DIR: /home/runner/work/acquia_cms/acquia_cms - COMPOSER_PROCESS_TIMEOUT: 1800 - ORCA_JOB: ${{ matrix.orca-job }} - #AWS_S3_BUCKET_PATH: s3://acquia-cms-artifacts/backstop - # Set Required API Keys. - CONNECTOR_ID: ${{ secrets.CONNECTOR_ID }} - SEARCH_UUID: ${{ secrets.SEARCH_UUID }} - CONNECTOR_KEY: ${{ secrets.CONNECTOR_KEY }} - GMAPS_KEY: ${{ secrets.GMAPS_KEY }} - SITESTUDIO_API_KEY: ${{ secrets.SITESTUDIO_API_KEY }} - SITESTUDIO_ORG_KEY: ${{ secrets.SITESTUDIO_ORG_KEY }} - ACMS_JOB: "backstop_tests" - JOB_TYPE: "integrated-tests" - CI: true - strategy: - fail-fast: false - matrix: - orca-job: - - INTEGRATED_TEST_ON_PREVIOUS_MINOR - - ISOLATED_TEST_ON_CURRENT - php-version: - - 8.1 - - 8.2 - orca-version: - - ^4 - steps: - - uses: actions/checkout@v3 - - name: Use Node.js 12.13.1 - uses: actions/setup-node@v3 - with: - node-version: 12.13.1 - - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - #coverage: xdebug - - name: Setup MySQL - run: | - sudo /etc/init.d/mysql start - mysql -uroot -proot < ./tests/ci/install.sql - - name: Download ORCA - run: | - 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: Configure AWS Credentials - # uses: aws-actions/configure-aws-credentials@v1 - # with: - # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # aws-region: ${{ secrets.AWS_DEFAULT_REGION }} - - 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 - - # Remove all PHPunit tests from acquia_cms modules. - find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';' - - if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_PREVIOUS_MINOR" ]; 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=$! - echo "CHROMEDRIVER_PID=${CHROMEDRIVER_PID}" >> ${GITHUB_ENV} - - name: Install - shell: 'script -q -e -c "bash {0}"' - run: ./tests/ci/install.sh - - name: Before script - run: ../orca/bin/ci/before_script.sh - - name: Script - run: ./tests/ci/script.sh - - name: Before Cache - run: ../orca/bin/ci/before_cache.sh - - name: After script - run: | - kill -0 ${{ env.CHROMEDRIVER_PID }} - ../orca/bin/ci/after_success.sh - ../orca/bin/ci/after_failure.sh - ../orca/bin/ci/after_script.sh + # backstop_tests: + # if: ${{ github.event_name == 'pull_request' }} + # name: backstop with ${{ matrix.orca-job }} on PHP ${{ matrix.php-version }} + # runs-on: ubuntu-latest + # env: + # # Site test artifacts. + # # ACMS_DB_ARTIFACT: "/home/runner/work/acquia_cms/acquia_cms/tests/acms.sql.gz" + # # ACMS_FILES_ARTIFACT: "/home/runner/work/acquia_cms/acquia_cms/tests/acms-files.tar.gz" + # # ACMS_STARTER_DB_ARTIFACT: "/home/runner/work/acquia_cms/acquia_cms/tests/acms-starter.sql.gz" + # # ACMS_STARTER_FILES_ARTIFACT: "/home/runner/work/acquia_cms/acquia_cms/tests/acms-files-starter.tar.gz" + # # Provide your package's name. + # ORCA_SUT_NAME: acquia/acquia_cms + # ORCA_SUT_BRANCH: develop + # ORCA_VERSION: ${{ matrix.orca-version }} + # ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml + # ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project + # ORCA_ENABLE_NIGHTWATCH: "FALSE" + # ORCA_PHPCS_STANDARD: AcquiaPHP + # ORCA_SUT_DIR: /home/runner/work/acquia_cms/acquia_cms + # COMPOSER_PROCESS_TIMEOUT: 1800 + # ORCA_JOB: ${{ matrix.orca-job }} + # #AWS_S3_BUCKET_PATH: s3://acquia-cms-artifacts/backstop + # # Set Required API Keys. + # CONNECTOR_ID: ${{ secrets.CONNECTOR_ID }} + # SEARCH_UUID: ${{ secrets.SEARCH_UUID }} + # CONNECTOR_KEY: ${{ secrets.CONNECTOR_KEY }} + # GMAPS_KEY: ${{ secrets.GMAPS_KEY }} + # SITESTUDIO_API_KEY: ${{ secrets.SITESTUDIO_API_KEY }} + # SITESTUDIO_ORG_KEY: ${{ secrets.SITESTUDIO_ORG_KEY }} + # ACMS_JOB: "backstop_tests" + # JOB_TYPE: "integrated-tests" + # CI: true + # strategy: + # fail-fast: false + # matrix: + # orca-job: + # - INTEGRATED_TEST_ON_PREVIOUS_MINOR + # - ISOLATED_TEST_ON_CURRENT + # php-version: + # - 8.1 + # - 8.2 + # orca-version: + # - ^4 + # steps: + # - uses: actions/checkout@v3 + # - name: Use Node.js 12.13.1 + # uses: actions/setup-node@v3 + # with: + # node-version: 12.13.1 + # - uses: shivammathur/setup-php@v2 + # with: + # php-version: ${{ matrix.php-version }} + # #coverage: xdebug + # - name: Setup MySQL + # run: | + # sudo /etc/init.d/mysql start + # mysql -uroot -proot < ./tests/ci/install.sql + # - name: Download ORCA + # run: | + # 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: Configure AWS Credentials + # # uses: aws-actions/configure-aws-credentials@v1 + # # with: + # # aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + # # aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # # aws-region: ${{ secrets.AWS_DEFAULT_REGION }} + # - 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 + # + # # Remove all PHPunit tests from acquia_cms modules. + # find modules/*/tests tests/src -type f -name "*Test.php" -exec rm -fr '{}' ';' + # + # if [ "${ORCA_JOB}" = "INTEGRATED_TEST_ON_PREVIOUS_MINOR" ]; 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=$! + # echo "CHROMEDRIVER_PID=${CHROMEDRIVER_PID}" >> ${GITHUB_ENV} + # - name: Install + # shell: 'script -q -e -c "bash {0}"' + # run: ./tests/ci/install.sh + # - name: Before script + # run: ../orca/bin/ci/before_script.sh + # - name: Script + # run: ./tests/ci/script.sh + # - name: Before Cache + # run: ../orca/bin/ci/before_cache.sh + # - name: After script + # run: | + # kill -0 ${{ env.CHROMEDRIVER_PID }} + # ../orca/bin/ci/after_success.sh + # ../orca/bin/ci/after_failure.sh + # ../orca/bin/ci/after_script.sh isolated_tests: if: ${{ github.event_name == 'pull_request' }} name: acquia_cms (${{ matrix.orca-job }}, ${{ matrix.modules }}) @@ -413,87 +413,87 @@ jobs: ../orca/bin/ci/after_success.sh ../orca/bin/ci/after_failure.sh ../orca/bin/ci/after_script.sh - run_update_hooks: - if: ${{ github.event_name == 'pull_request' }} - name: "Module Upgrades" - runs-on: ubuntu-latest - env: - # Set ORCA related environment variables. - ORCA_SUT_NAME: acquia/acquia_cms - ORCA_SUT_BRANCH: develop - ORCA_VERSION: ^3 - ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml - ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project - ORCA_ENABLE_NIGHTWATCH: "FALSE" - ORCA_SUT_DIR: /home/runner/work/acquia_cms/acquia_cms - - # Set Required API Keys. - CONNECTOR_ID: ${{ secrets.CONNECTOR_ID }} - SEARCH_UUID: ${{ secrets.SEARCH_UUID }} - CONNECTOR_KEY: ${{ secrets.CONNECTOR_KEY }} - GMAPS_KEY: ${{ secrets.GMAPS_KEY }} - SITESTUDIO_API_KEY: ${{ secrets.SITESTUDIO_API_KEY }} - SITESTUDIO_ORG_KEY: ${{ secrets.SITESTUDIO_ORG_KEY }} - - #Add other required environment variables. - COMPOSER_PROCESS_TIMEOUT: 1800 - CI: true - GIT_AUTHOR_NAME: "Github Actions" - GIT_AUTHOR_EMAIL: "github-actions@exmaple.com" - - GIT_COMMITTER_NAME: "Github Actions" - GIT_COMMITTER_EMAIL: "github-actions@exmaple.com" - ORCA_JOB: ISOLATED_TEST_ON_CURRENT - ACMS_JOB: "upgrade_modules" - strategy: - fail-fast: false - #php-version: [ "8.1" ] - steps: - - uses: actions/checkout@v3 - - name: Use Node.js 12.13.1 - uses: actions/setup-node@v3 - with: - node-version: 12.13.1 - - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - #coverage: xdebug - - name: Setup MySQL - run: | - sudo /etc/init.d/mysql start - mysql -uroot -proot < ./tests/ci/install.sql - - name: Download ORCA - run: | - 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 - - 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 - ./tests/ci/before_install.blt.sh - - name: Install - shell: 'script -q -e -c "bash {0}"' - run: ./tests/ci/install.sh - - name: Run Update hooks - shell: 'script -q -e -c "bash {0}"' - run: ./tests/ci/run_update_hooks.sh - env: - # @see ./tests/ci/before_install.blt.sh - DRUPAL_ORG_CHANGES: ${{ env.DRUPAL_ORG_CHANGES }} - - name: Script - run backstop tests - run: | - source ../orca/bin/ci/_includes.sh - cd ${ORCA_FIXTURE_DIR} - chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 & - CHROMEDRIVER_PID=$! - echo "CHROMEDRIVER_PID=${CHROMEDRIVER_PID}" >> ${GITHUB_ENV} - ./vendor/bin/drush en acquia_cms_development -y - ./vendor/bin/drush en acquia_cms_starter -y - ./vendor/bin/drush cr - cd ${ORCA_SUT_DIR} - ./tests/ci/script.sh + # run_update_hooks: + # if: ${{ github.event_name == 'pull_request' }} + # name: "Module Upgrades" + # runs-on: ubuntu-latest + # env: + # # Set ORCA related environment variables. + # ORCA_SUT_NAME: acquia/acquia_cms + # ORCA_SUT_BRANCH: develop + # ORCA_VERSION: ^3 + # ORCA_PACKAGES_CONFIG_ALTER: ../acquia_cms/tests/packages_alter.yml + # ORCA_FIXTURE_PROJECT_TEMPLATE: acquia/drupal-recommended-project + # ORCA_ENABLE_NIGHTWATCH: "FALSE" + # ORCA_SUT_DIR: /home/runner/work/acquia_cms/acquia_cms + # + # # Set Required API Keys. + # CONNECTOR_ID: ${{ secrets.CONNECTOR_ID }} + # SEARCH_UUID: ${{ secrets.SEARCH_UUID }} + # CONNECTOR_KEY: ${{ secrets.CONNECTOR_KEY }} + # GMAPS_KEY: ${{ secrets.GMAPS_KEY }} + # SITESTUDIO_API_KEY: ${{ secrets.SITESTUDIO_API_KEY }} + # SITESTUDIO_ORG_KEY: ${{ secrets.SITESTUDIO_ORG_KEY }} + # + # #Add other required environment variables. + # COMPOSER_PROCESS_TIMEOUT: 1800 + # CI: true + # GIT_AUTHOR_NAME: "Github Actions" + # GIT_AUTHOR_EMAIL: "github-actions@exmaple.com" + # + # GIT_COMMITTER_NAME: "Github Actions" + # GIT_COMMITTER_EMAIL: "github-actions@exmaple.com" + # ORCA_JOB: ISOLATED_TEST_ON_CURRENT + # ACMS_JOB: "upgrade_modules" + # strategy: + # fail-fast: false + # #php-version: [ "8.1" ] + # steps: + # - uses: actions/checkout@v3 + # - name: Use Node.js 12.13.1 + # uses: actions/setup-node@v3 + # with: + # node-version: 12.13.1 + # - uses: shivammathur/setup-php@v2 + # with: + # php-version: 8.2 + # #coverage: xdebug + # - name: Setup MySQL + # run: | + # sudo /etc/init.d/mysql start + # mysql -uroot -proot < ./tests/ci/install.sql + # - name: Download ORCA + # run: | + # 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 + # - 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 + # ./tests/ci/before_install.blt.sh + # - name: Install + # shell: 'script -q -e -c "bash {0}"' + # run: ./tests/ci/install.sh + # - name: Run Update hooks + # shell: 'script -q -e -c "bash {0}"' + # run: ./tests/ci/run_update_hooks.sh + # env: + # # @see ./tests/ci/before_install.blt.sh + # DRUPAL_ORG_CHANGES: ${{ env.DRUPAL_ORG_CHANGES }} + # - name: Script - run backstop tests + # run: | + # source ../orca/bin/ci/_includes.sh + # cd ${ORCA_FIXTURE_DIR} + # chromedriver --disable-dev-shm-usage --disable-extensions --disable-gpu --headless --no-sandbox --port=4444 & + # CHROMEDRIVER_PID=$! + # echo "CHROMEDRIVER_PID=${CHROMEDRIVER_PID}" >> ${GITHUB_ENV} + # ./vendor/bin/drush en acquia_cms_development -y + # ./vendor/bin/drush en acquia_cms_starter -y + # ./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)" diff --git a/composer.lock b/composer.lock index e31723b2ad..34790bddd7 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": "db339de908cffff52364bdf29c9f58b0", + "content-hash": "e1c52ae4e489bcac46a090feed2fc04b", "packages": [ { "name": "acquia/acquia-cms-starterkit", @@ -20986,5 +20986,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" }