From ca00ba2adf3831d7b82ba51066ebf20dcfcde55f Mon Sep 17 00:00:00 2001
From: Kevin Wenger <wenger.kev@gmail.com>
Date: Tue, 12 Mar 2024 11:07:06 +0100
Subject: [PATCH] use stable Drupal 10.2

---
 10/10.2/Dockerfile        | 14 +++-----------
 10/10.2/tests/config.yaml |  4 ++--
 10/10.3/tests/config.yaml |  4 ++--
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/10/10.2/Dockerfile b/10/10.2/Dockerfile
index 5536ae5..06e6ce0 100644
--- a/10/10.2/Dockerfile
+++ b/10/10.2/Dockerfile
@@ -29,21 +29,13 @@ RUN curl -OL https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait
 # installed into the vendor directory.
 RUN composer config --no-interaction allow-plugins true
 
+# Install Drupal Dev dependencies such as PHPUnit, Behat-Mink, ...
+RUN COMPOSER_MEMORY_LIMIT=-1 composer require --dev drupal/core-dev:~${DRUPAL_VERSION}
+
 # Install Drush.
 # Drush will be heavily use to setup a working Drupal environment.
 RUN COMPOSER_MEMORY_LIMIT=-1 composer require drush/drush:^12.0
 
-# Prepare for Drupal 10.2 upgrade.
-# @see https://www.drupal.org/docs/upgrading-drupal/upgrading-from-drupal-8-to-drupal-9-or-higher
-RUN composer require drupal/core-recommended:~${DRUPAL_VER} --update-with-all-dependencies --no-update
-RUN composer require drupal/core-dev:~${DRUPAL_VER} --dev --update-with-all-dependencies --no-update
-
-# Set the minimum stability to "dev" to allow installing unstable Drupal Core.
-RUN composer config minimum-stability dev
-
-# Perform Drupal 10.1 installation.
-RUN COMPOSER_MEMORY_LIMIT=-1 composer update --with-all-dependencies
-
 # Clean repository.
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
diff --git a/10/10.2/tests/config.yaml b/10/10.2/tests/config.yaml
index 754a7c8..c22558d 100644
--- a/10/10.2/tests/config.yaml
+++ b/10/10.2/tests/config.yaml
@@ -13,11 +13,11 @@ commandTests:
   - name: 'Drupal version'
     command: 'drush'
     args: ['status']
-    expectedOutput: ['Drupal version\s+:\s+10\.2\.[\d-alpha\d|\d-beta\d|\d-dev|\d-rc\d|\d*]']
+    expectedOutput: ['Drupal version\s+:\s+10\.2\.(x|\d+)(-(alpha|beta|dev|rc))?' ]
   - name: 'Drupal Core Dev version'
     command: bash
     args: ['-c', 'composer show drupal/core-dev']
-    expectedOutput: ['versions\s+:\s\* 10\.2\.[\d-alpha\d|\d-beta\d|\d-dev|\d-rc\d|\d*]']
+    expectedOutput: ['versions\s+:\s\* 10\.2\.(x|\d+)(-(alpha|beta|dev|rc))?']
   - name: 'Drush location'
     command: 'drush'
     args: ['status']
diff --git a/10/10.3/tests/config.yaml b/10/10.3/tests/config.yaml
index 1854b68..a3cc79a 100644
--- a/10/10.3/tests/config.yaml
+++ b/10/10.3/tests/config.yaml
@@ -13,11 +13,11 @@ commandTests:
   - name: 'Drupal version'
     command: 'drush'
     args: ['status']
-    expectedOutput: ['Drupal version\s+:\s+10\.3\.(alpha|beta|dev|rc|\d+)']
+    expectedOutput: ['Drupal version\s+:\s+10\.3\.(x|\d+)(-(alpha|beta|dev|rc))?']
   - name: 'Drupal Core Dev version'
     command: bash
     args: ['-c', 'composer show drupal/core-dev']
-    expectedOutput: ['versions\s+:\s\* 10\.3\.(x|0)(-(alpha|beta|dev|rc))?']
+    expectedOutput: ['versions\s+:\s\* 10\.3\.(x|\d+)(-(alpha|beta|dev|rc))?']
   - name: 'Drush location'
     command: 'drush'
     args: ['status']