Merge branch 'release/3.2.0'

acquia · Jan 14, 2021 · 371ced3 · 371ced3
2 parents 52adb62 + c4aa21e
commit 371ced3
Show file tree

Hide file tree

Showing 62 changed files with 647 additions and 795 deletions.
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.travis.yml b/.travis.yml
@@ -46,7 +46,7 @@ jobs:
     - { 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=ISOLATED_TEST_ON_CURRENT_DEV, name: "Isolated test on current dev Drupal core version" }
+    - { env: ORCA_JOB=ISOLATED_TEST_ON_CURRENT_DEV ORCA_ENABLE_NIGHTWATCH=TRUE, name: "Isolated test on current dev Drupal core version with Nightwatch.js" }
     - { 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" }
     - { env: ORCA_JOB=STRICT_DEPRECATED_CODE_SCAN, name: "Strict deprecated code scan" }

diff --git a/bin/changelog.sh b/bin/changelog.sh
@@ -23,7 +23,7 @@ eval "$GITHUB_CHANGELOG_GENERATOR" \
   --project=orca \
   --output=docs/CHANGELOG.md \
   --no-issues-wo-labels \
-  --exclude-labels=dependencies,duplicate,question,invalid,wontfix \
+  --exclude-labels=duplicate,question,invalid,wontfix \
   --exclude-tags-regex='v[1-2].*' \
   --future-release="$FUTURE_RELEASE" \
   --release-branch=develop