Merge branch 'hotfix/3.1.1'

acquia · Dec 4, 2020 · 50af84f · 50af84f
2 parents 6f2dcea + 639f94c
commit 50af84f
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -64,6 +64,8 @@ jobs:
     - { env: ORCA_LIVE_TEST=TRUE, name: "Integrated live test" }
   allow_failures:
     - 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_DEV
     - env: ORCA_LIVE_TEST=TRUE
 
 before_install:

diff --git a/bin/changelog.sh b/bin/changelog.sh
@@ -16,13 +16,14 @@ cd "$(dirname "$0")/.." || exit
 GITHUB_CHANGELOG_GENERATOR=$(find /usr/local/lib/ruby/gems/*/bin/github_changelog_generator | tail -1)
 FUTURE_RELEASE=$(cat config/VERSION)
 
+set -v
+
 eval "$GITHUB_CHANGELOG_GENERATOR" \
   --user=acquia \
   --project=orca \
   --output=docs/CHANGELOG.md \
   --no-issues-wo-labels \
-  --no-issues-wo-labels \
   --exclude-labels=dependencies,duplicate,question,invalid,wontfix \
-  --since-tag=v2.11.4 \
+  --exclude-tags-regex='v[1-2].*' \
   --future-release="$FUTURE_RELEASE" \
   --release-branch=develop
diff --git a/config/VERSION b/config/VERSION
@@ -1 +1 @@
-v3.1.0
+v3.1.1
diff --git a/config/packages.yml b/config/packages.yml
@@ -214,7 +214,7 @@ drupal/media_acquiadam: []
 drupal/mysql56:
   type: library
   core_matrix:
-    '>=9.0.0':
+    '~9.0.0':
       version: '*'
       version_dev: '*'
     '*':

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [v3.1.1](https://github.com/acquia/orca/tree/v3.1.1) (2020-12-04)
+
+[Full Changelog](https://github.com/acquia/orca/compare/v3.1.0...v3.1.1)
+
+**Fixed bugs:**
+
+- Fix NEXT\_MINOR\_DEV jobs fail when there's no NEXT\_MINOR Drupal core version yet [\#119](https://github.com/acquia/orca/pull/119) ([TravisCarden](https://github.com/TravisCarden))
+
 ## [v3.1.0](https://github.com/acquia/orca/tree/v3.1.0) (2020-11-19)
 
 [Full Changelog](https://github.com/acquia/orca/compare/v3.0.0...v3.1.0)
@@ -16,10 +24,22 @@
 **Breaking changes:**
 
 - Implement new CI job spread to cover more Drupal core versions and scenarios [\#115](https://github.com/acquia/orca/pull/115) ([TravisCarden](https://github.com/TravisCarden))
+- Make default project template selection automatic based on core version [\#105](https://github.com/acquia/orca/pull/105) ([TravisCarden](https://github.com/TravisCarden))
+
+**Implemented enhancements:**
+
+- Add preflight test for a "version" value in the SUT's composer.json [\#108](https://github.com/acquia/orca/pull/108) ([TravisCarden](https://github.com/TravisCarden))
+- Enable using other test coverage services than Coveralls [\#106](https://github.com/acquia/orca/pull/106) ([TravisCarden](https://github.com/TravisCarden))
+- Create new 'debug:guess-version' command [\#103](https://github.com/acquia/orca/pull/103) ([TravisCarden](https://github.com/TravisCarden))
+- Add support for test coverage tracking with Coveralls [\#101](https://github.com/acquia/orca/pull/101) ([japerry](https://github.com/japerry))
 
 **Fixed bugs:**
 
 - Fix project template tests [\#113](https://github.com/acquia/orca/pull/113) ([danepowell](https://github.com/danepowell))
+- Fix broken 'fixture:init --symlink-all' option [\#102](https://github.com/acquia/orca/pull/102) ([TravisCarden](https://github.com/TravisCarden))
+- Fix/move report:code-coverage command [\#99](https://github.com/acquia/orca/pull/99) ([TravisCarden](https://github.com/TravisCarden))
+- Set Node.js to a version compatible with Drupal 9 + Nightwatch.js. [\#94](https://github.com/acquia/orca/pull/94) ([TravisCarden](https://github.com/TravisCarden))
+- Fix broken support for absolute package paths [\#93](https://github.com/acquia/orca/pull/93) ([TravisCarden](https://github.com/TravisCarden))
 
 **Removed:**
 

diff --git a/src/Domain/Composer/Version/DrupalCoreVersionResolver.php b/src/Domain/Composer/Version/DrupalCoreVersionResolver.php
@@ -54,6 +54,13 @@ class DrupalCoreVersionResolver {
    */
   private $nextMinor;
 
+  /**
+   * The next minor dev version of Drupal core.
+   *
+   * @var string|null
+   */
+  private $nextMinorDev;
+
   /**
    * The oldest supported version of Drupal core.
    *
@@ -300,7 +307,14 @@ private function findNextMinor(): string {
    * @throws \Acquia\Orca\Exception\OrcaVersionNotFoundException
    */
   private function findNextMinorDev(): string {
-    return $this->convertToDev($this->findNextMinor());
+    if ($this->nextMinorDev) {
+      return $this->nextMinorDev;
+    }
+
+    $this->nextMinorDev = $this
+      ->resolveArbitrary(">{$this->findCurrent()}", 'dev', TRUE);
+
+    return $this->nextMinorDev;
   }
 
   /**