Merge branch 'release/3.26.0'

acquia · Dec 12, 2022 · c1a4332 · c1a4332
2 parents 0b578b1 + 771dc85
commit c1a4332
Show file tree

Hide file tree

Showing 13 changed files with 212 additions and 157 deletions.
diff --git a/.github/workflows/live-test.yml b/.github/workflows/live-test.yml
@@ -33,7 +33,7 @@ jobs:
       matrix:
         orca-job:
           - " "
-        php-version: [ "7.4" ]
+        php-version: [ "8.1" ]
     steps:
       - uses: actions/checkout@v2
 

diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml
@@ -24,69 +24,77 @@ jobs:
       ORCA_SUT_BRANCH: main
       ORCA_PACKAGES_CONFIG: example/tests/packages.yml
       ORCA_PACKAGES_CONFIG_ALTER: example/tests/packages_alter.yml
-      ORCA_ENABLE_NIGHTWATCH: ${{ matrix.orca-enable-nightwatch }}
       # Hardcode path since GITHUB_WORKSPACE can't be used here.
       # @see https://github.saobby.my.eu.orgmunity/t/how-to-use-env-context/16975/9
       ORCA_SUT_DIR: /home/runner/work/orca/example
-      ORCA_SELF_TEST_COVERAGE_CLOVER: $HOME/build/logs/clover-self.xml
+      ORCA_SELF_TEST_COVERAGE_CLOVER: /home/runner/build/logs/clover.xml
       ORCA_JOB: ${{ matrix.orca-job }}
+      ORCA_COVERALLS_ENABLE: ${{ matrix.orca-coveralls-enable }}
+      COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      ORCA_ENABLE_NIGHTWATCH: ${{ matrix.orca-enable-nightwatch }}
 
     strategy:
       matrix:
         orca-job:
           - STATIC_CODE_ANALYSIS
           - INTEGRATED_TEST_ON_OLDEST_SUPPORTED
-          - INTEGRATED_TEST_ON_LATEST_LTS
           - INTEGRATED_TEST_ON_PREVIOUS_MINOR
-          - INTEGRATED_UPGRADE_TEST_FROM_PREVIOUS_MINOR
-          - ISOLATED_TEST_ON_CURRENT
+          # - INTEGRATED_UPGRADE_TEST_FROM_PREVIOUS_MINOR
           - INTEGRATED_TEST_ON_CURRENT
-          - INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR
+          # - INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR
           - ISOLATED_TEST_ON_CURRENT_DEV
           - INTEGRATED_TEST_ON_CURRENT_DEV
           - STRICT_DEPRECATED_CODE_SCAN
           - ISOLATED_TEST_ON_NEXT_MINOR
           - INTEGRATED_TEST_ON_NEXT_MINOR
-          - ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_BETA_OR_LATER
-          - ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_DEV
+          # - ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_BETA_OR_LATER
+          # - ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_DEV
           - DEPRECATED_CODE_SCAN_W_CONTRIB
           - INTEGRATED_TEST_ON_NEXT_MINOR_DEV
           - ISOLATED_TEST_ON_NEXT_MINOR_DEV
-          - INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR_DEV
+          # - INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR_DEV
           - LOOSE_DEPRECATED_CODE_SCAN
-          # - ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
-          # - INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
-          # - ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
-          # - INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
-        php-version: [ "7.4" ]
+          - INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
+          - ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
+          - INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
+        php-version: [ "8.1" ]
+        orca-coveralls-enable: [ "FALSE" ]
+        orca-enable-nightwatch: [ "FALSE" ]
         include:
-          - orca-job: ISOLATED_TEST_ON_CURRENT
-            php-version: "8.0"
-            orca-enable-nightwatch: "TRUE"
-
-          - orca-job: ISOLATED_TEST_ON_CURRENT
+          - orca-job: STATIC_CODE_ANALYSIS
             php-version: "8.1"
-            orca-enable-nightwatch: "TRUE"
+            orca-coveralls-enable: "TRUE"
+            orca-enable-nightwatch: "FALSE"
 
-          - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
-            php-version: "8.1"
-            orca-enable-nightwatch: "TRUE"
+          - orca-job: INTEGRATED_TEST_ON_OLDEST_SUPPORTED
+            php-version: "7.4"
+            orca-enable-nightwatch: "FALSE"
+            orca-coveralls-enable: "FALSE"
 
-          - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
-            php-version: "8.1"
-            orca-enable-nightwatch: "TRUE"
+          - orca-job: INTEGRATED_TEST_ON_OLDEST_SUPPORTED
+            php-version: "8.0"
+            orca-enable-nightwatch: "FALSE"
+            orca-coveralls-enable: "FALSE"
 
           - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
             php-version: "8.1"
+            orca-coveralls-enable: "FALSE"
             orca-enable-nightwatch: "TRUE"
 
-          - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
+          - orca-job: INTEGRATED_TEST_ON_LATEST_LTS
+            php-version: "7.4"
+            orca-coveralls-enable: "FALSE"
+            orca-enable-nightwatch: "FALSE"
+
+          - orca-job: ISOLATED_TEST_ON_CURRENT
             php-version: "8.1"
+            orca-enable-nightwatch: "TRUE"
+            orca-coveralls-enable: "FALSE"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 16.x
 
@@ -117,6 +125,8 @@ jobs:
       - name: After script
         run: |
           ../orca/bin/ci/self-test/after_success.sh
+          unset ORCA_COVERAGE_ENABLE
+          unset ORCA_COVERALLS_ENABLE
           ../orca/bin/ci/after_success.sh
           ../orca/bin/ci/after_failure.sh
           ../orca/bin/ci/after_script.sh

diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ dist: focal
 
 version: ~> 1.0
 
-php: "7.4"
+php: "8.1"
 
 cache:
   directories:
@@ -30,24 +30,24 @@ env:
     - ORCA_SUT_BRANCH=main
     - ORCA_PACKAGES_CONFIG=example/tests/packages.yml
     - ORCA_PACKAGES_CONFIG_ALTER=example/tests/packages_alter.yml
-    - ORCA_ENABLE_NIGHTWATCH=TRUE
+    - ORCA_ENABLE_NIGHTWATCH=FALSE
     - ORCA_SUT_DIR=${TRAVIS_BUILD_DIR}/example
     - ORCA_SELF_TEST_COVERAGE_CLOVER=$HOME/build/logs/clover-self.xml
 
 jobs:
   fast_finish: true
   include:
     - { env: ORCA_JOB=STATIC_CODE_ANALYSIS ORCA_COVERALLS_ENABLE=TRUE, name: "Static code analysis with Coveralls" }
+    - { env: ORCA_JOB=INTEGRATED_TEST_ON_OLDEST_SUPPORTED, php: "7.4", name: "Integrated test on oldest supported Drupal core version in php 7.4" }
+    - { env: ORCA_JOB=INTEGRATED_TEST_ON_OLDEST_SUPPORTED, php: "8.0", name: "Integrated test on oldest supported Drupal core version in php 8.0" }
     - { env: ORCA_JOB=INTEGRATED_TEST_ON_OLDEST_SUPPORTED, name: "Integrated test on oldest supported Drupal core version" }
-    - { env: ORCA_JOB=INTEGRATED_TEST_ON_LATEST_LTS, name: "Integrated test on latest LTS Drupal core version" }
+    - { env: ORCA_JOB=INTEGRATED_TEST_ON_LATEST_LTS, php: "7.4", name: "Integrated test on latest LTS Drupal core version" }
     - { env: ORCA_JOB=INTEGRATED_TEST_ON_PREVIOUS_MINOR, name: "Integrated test on previous minor Drupal core version" }
-    - { env: ORCA_JOB=INTEGRATED_UPGRADE_TEST_FROM_PREVIOUS_MINOR, name: "Integrated upgrade test from previous minor Drupal core version" }
-    - { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT, name: "Isolated test on current Drupal core version" }
-    - { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT, php: "8.0", name: "Isolated test on current Drupal core version and PHP 8.0" }
-    - { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT, php: "8.1", name: "Isolated test on current Drupal core version and PHP 8.1" }
+    # - { env: ORCA_JOB=INTEGRATED_UPGRADE_TEST_FROM_PREVIOUS_MINOR, name: "Integrated upgrade test from previous minor Drupal core version" }
+    - { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT ORCA_ENABLE_NIGHTWATCH=TRUE, name: "Isolated test on current Drupal core version" }
     - { env: ORCA_JOB=INTEGRATED_TEST_ON_CURRENT, name: "Integrated test on current Drupal core version" }
-    - { env: ORCA_JOB=INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR, name: "Integrated upgrade test to next minor Drupal core version" }
-    - { env: ORCA_JOB=INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR_DEV, name: "Integrated upgrade test to next minor dev Drupal core version" }
+    # - { env: ORCA_JOB=INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR, name: "Integrated upgrade test to next minor Drupal core version" }
+    # - { env: ORCA_JOB=INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR_DEV, name: "Integrated upgrade test to next minor dev Drupal core version" }
     - { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV, name: "Isolated test on current dev Drupal core version" }
     - { env: ORCA_JOB=INTEGRATED_TEST_ON_CURRENT_DEV, name: "Integrated test on current dev Drupal core version" }
     - { env: ORCA_JOB=LOOSE_DEPRECATED_CODE_SCAN, name: "Loose deprecated code scan" }
@@ -57,25 +57,26 @@ jobs:
     - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MINOR, name: "Integrated test on next minor Drupal core version" }
     - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MINOR_DEV, name: "Isolated test on next minor dev Drupal core version" }
     - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MINOR_DEV, name: "Integrated test on next minor dev Drupal core version" }
-    - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, php: "8.1", name: "Isolated test on next major, latest minor beta-or-later Drupal core version" }
-    - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, php: "8.1", name: "Integrated test on next major, latest minor beta-or-later Drupal core version" }
-    - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1",  name: "Isolated test on next major, latest minor dev Drupal core version" }
-    - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1", name: "Integrated test on next major, latest minor dev Drupal core version" }
-    - { env: ORCA_JOB=ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_BETA_OR_LATER, name: "Isolated upgrade test to next major beta-or-later Drupal core version" }
-    - { env: ORCA_JOB=ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_DEV, name: "Isolated upgrade test to next major dev Drupal core version" }
-    - { env: ORCA_LIVE_TEST=TRUE ORCA_PACKAGES_CONFIG= ORCA_PACKAGES_CONFIG_ALTER= ORCA_ENABLE_NIGHTWATCH=FALSE, name: "Integrated live test" }
+    # - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, name: "Isolated test on next major, latest minor beta-or-later Drupal core version" }
+    # - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, name: "Integrated test on next major, latest minor beta-or-later Drupal core version" }
+    # - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, name: "Isolated test on next major, latest minor dev Drupal core version" }
+    # - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, name: "Integrated test on next major, latest minor dev Drupal core version" }
+    # - { env: ORCA_JOB=ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_BETA_OR_LATER, name: "Isolated upgrade test to next major beta-or-later Drupal core version" }
+    # - { env: ORCA_JOB=ISOLATED_UPGRADE_TEST_TO_NEXT_MAJOR_DEV, name: "Isolated upgrade test to next major dev Drupal core version" }
+    - { env: ORCA_LIVE_TEST=TRUE ORCA_PACKAGES_CONFIG= ORCA_PACKAGES_CONFIG_ALTER=, name: "Integrated live test" }
   allow_failures:
+    - env: ORCA_JOB=LOOSE_DEPRECATED_CODE_SCAN
     - env: ORCA_JOB=DEPRECATED_CODE_SCAN_W_CONTRIB
     - env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MINOR_DEV
     - env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MINOR
     - env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MINOR_DEV
-    - env: ORCA_LIVE_TEST=TRUE ORCA_PACKAGES_CONFIG= ORCA_PACKAGES_CONFIG_ALTER= ORCA_ENABLE_NIGHTWATCH=FALSE
     - env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV
     - env: ORCA_JOB=INTEGRATED_TEST_ON_CURRENT_DEV
-    - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1"}
-    - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV, php: "8.1"}
-    - { env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, php: "8.1"}
-    - { env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER, php: "8.1"}
+    - env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
+    - env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
+    - env: ORCA_JOB=ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
+    - env: ORCA_JOB=INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
+    - env: ORCA_LIVE_TEST=TRUE ORCA_PACKAGES_CONFIG= ORCA_PACKAGES_CONFIG_ALTER=
 
 before_install:
   - nvm install 16; nvm use 16

diff --git a/bin/ci/before_install.sh b/bin/ci/before_install.sh
@@ -51,29 +51,39 @@ if [[ "$TRAVIS" ]]; then
 
   # Install the PECL YAML parser for strict YAML parsing.
   yes | pecl install yaml
+fi
 
-  # Install ChroneDriver.
-  # @see https://chromedriver.chromium.org/downloads/version-selection
-  # Get Google Chrome version.
-  CHROMEDRIVER="$( google-chrome-stable --version)"
-  echo "$CHROMEDRIVER"
-  CHROMEDRIVER_VERSION="$(echo "$CHROMEDRIVER" | awk '{print $3}')"
-  echo "CHROMEDRIVER_VERSION=$CHROMEDRIVER_VERSION"
-  # Cut off last part from google chrome version.
-  CHROMEDRIVER_VERSION_FAMILY="$(echo "$CHROMEDRIVER_VERSION" | awk -F'.' '{print $1,$2,$3}' OFS='.' )"
-  echo "VERSION_FAMILY=$CHROMEDRIVER_VERSION_FAMILY"
-  # check latest_release
-  VERSION=$(curl -f --silent https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_VERSION_FAMILY})
-  echo "FINAL_VERSION=$VERSION"
-  # Download driver
-  wget -N https://chromedriver.storage.googleapis.com/${VERSION}/chromedriver_linux64.zip -P ~/
-  unzip ~/chromedriver_linux64.zip -d ~/
-  rm ~/chromedriver_linux64.zip
-  sudo mv -f ~/chromedriver /usr/local/share/
-  sudo chmod +x /usr/local/share/chromedriver
-  sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+if [[ "$JENKINS_HOME" || "$TRAVIS" ]]; then
+    # Install ChromeDriver.
+    # @see https://chromedriver.chromium.org/downloads/version-selection
+    # Get Google Chrome version.
+    CHROMEDRIVER="$( google-chrome-stable --version)"
+    echo "$CHROMEDRIVER"
+    CHROMEDRIVER_VERSION="$(echo "$CHROMEDRIVER" | awk '{print $3}')"
+    echo "CHROMEDRIVER_VERSION=$CHROMEDRIVER_VERSION"
+    # Cut off last part from google chrome version.
+    CHROMEDRIVER_VERSION_FAMILY="$(echo "$CHROMEDRIVER_VERSION" | awk -F'.' '{print $1,$2,$3}' OFS='.' )"
+    echo "VERSION_FAMILY=$CHROMEDRIVER_VERSION_FAMILY"
+    # check latest_release
+    VERSION=$(curl -f --silent https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROMEDRIVER_VERSION_FAMILY})
+    echo "FINAL_VERSION=$VERSION"
+    # Download driver
+    wget -N https://chromedriver.storage.googleapis.com/${VERSION}/chromedriver_linux64.zip -P ~/
+    unzip ~/chromedriver_linux64.zip -d ~/
+    rm ~/chromedriver_linux64.zip
+
+    if [ "$JENKINS_HOME" ]; then
+      mv -f ~/chromedriver /usr/local/share/
+      chmod +x /usr/local/share/chromedriver
+      ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+    else
+      sudo mv -f ~/chromedriver /usr/local/share/
+      sudo chmod +x /usr/local/share/chromedriver
+      sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+    fi
 fi
 
+
 # Display PHP information.
 which php
 php -i

diff --git a/config/VERSION b/config/VERSION
@@ -1 +1 @@
-v3.25.1
+v3.26.0
diff --git a/config/packages.yml b/config/packages.yml
@@ -52,29 +52,53 @@ acquia/acquia_cms:
   version_dev: ~
 
 drupal/acquia_connector:
-  version: 3.x
-  version_dev: 3.x-dev
+  core_matrix:
+    10.x:
+      version: ~
+      version_dev: ~
+    '*':
+      version: 4.x
+      version_dev: 4.x-dev
 
 drupal/acquia_contenthub:
-  version: 2.x
-  version_dev: 2.x-dev
+  core_matrix:
+    10.x:
+      version: ~
+      version_dev: ~
+    '*':
+      version: 2.x
+      version_dev: 2.x-dev
 
 drupal/acquia_lift:
-  version: 4.x
-  version_dev: 4.x-dev
+  core_matrix:
+    10.x:
+      version: ~
+      version_dev: ~
+    '*':
+      version: 4.x
+      version_dev: 4.x-dev
 
 drupal/acquia_purge:
   version: 1.x
   version_dev: 1.x-dev
 
-drupal/acsf: []
+drupal/acsf:
+  version: 2.x
+  version_dev: ~
 
 drupal/acsf_sso:
   enable: false
+  version: 2.x
+  version_dev: ~
 
 drupal/acquia_search:
-  version: 3.0.x
-  version_dev: 3.x-dev
+  core_matrix:
+    10.x:
+      version: ~
+      version_dev: ~
+    '*':
+      version: 3.0.x
+      version_dev: 3.x-dev
 
 acquia/blt:
   type: composer-plugin
@@ -96,34 +120,23 @@ acquia/drupal-recommended-project:
 
 acquia/drupal-spec-tool:
   type: behat-extension
-  version: 5.x
-  version_dev: 5.x-dev
+  core_matrix:
+    10.x:
+      version: ~
+      version_dev: 6.x-dev
+    '*':
+      version: 5.x
+      version_dev: 5.x-dev
 
 acquia/memcache-settings:
   type: library
 
-# Temporarily remove Lightning components due to related service disruption.
-#drupal/lightning_api:
-#  version: 4.x
-#  version_dev: 4.x-dev
-#
-#drupal/lightning_core:
-#  version: 5.x
-#  version_dev: 5.x-dev
-#
-#drupal/lightning_layout:
-#  version: 2.x
-#  version_dev: 2.x-dev
-#
-#drupal/lightning_media:
-#  version: 4.x
-#  version_dev: 5.0.x-dev
-#
-#drupal/lightning_workflow:
-#  version: 3.x
-#  version_dev: 3.x-dev
-
-drupal/mautic: []
+drupal/mautic:
+  core_matrix:
+    10.x:
+      version: ~
+      version_dev: ~
+    '*': []
 
 drupal/media_acquiadam:
   core_matrix:
@@ -134,6 +147,15 @@ drupal/media_acquiadam:
       version: 2.x
       version_dev: 2.x-dev
 
+drupal/acquia_dam:
+  core_matrix:
+    10.x:
+      version: ~
+      version_dev: ~
+    '*':
+      version: 1.x
+      version_dev: 1.0.x-dev
+
 drupal/mysql56:
   type: library
   core_matrix: