From fcf201e9275da361e7450cc6ad0917a03fc4174c Mon Sep 17 00:00:00 2001
From: Daniel Bosen <daniel.bosen@burda.com>
Date: Thu, 8 Feb 2024 17:16:19 +0100
Subject: [PATCH] Fix thunder distribution pipeline (#77)

* Update prepare_build.sh

* Do not test Drupal 9
---
 .github/workflows/tests.yml | 19 ++-----------------
 lib/stages/prepare_build.sh |  2 +-
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ac327ee..8d96243 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,28 +21,13 @@ jobs:
 
     strategy:
       matrix:
-        RUN: [1, 2, 3, 4, 5]
+        RUN: [1, 2]
         include:
           - RUN: 1
-            DRUPAL_TESTING_DRUPAL_VERSION: '~9.3'
-            DRUPAL_TESTING_COMPOSER_PROJECT: 'drupal/recommended-project'
+            DRUPAL_TESTING_DRUPAL_VERSION: '~10.0'
             PHP_VERSION: '8.1'
           - RUN: 2
-            DRUPAL_TESTING_DRUPAL_VERSION: '~9.3.0'
-            DRUPAL_TESTING_MIN_BUILD: true
-            PHP_VERSION: '8.1'
-          - RUN: 3
-            DRUPAL_TESTING_COMPOSER_PROJECT: 'thunder/thunder-project'
-            DRUPAL_TESTING_DRUPAL_VERSION: '~9.4.0'
-            DRUPAL_TESTING_COMPOSER_PROJECT_VERSION: '3.0.12'
-            PHP_VERSION: '7.4'
-          - RUN: 4
-            DRUPAL_TESTING_DRUPAL_VERSION: '~9.4'
-            PHP_VERSION: '8.0'
-          - RUN: 5
             DRUPAL_TESTING_DRUPAL_VERSION: '~10.0'
-            PHP_VERSION: '8.1'
-          - RUN: 6
             PHP_VERSION: '8.2'
 
     steps:
diff --git a/lib/stages/prepare_build.sh b/lib/stages/prepare_build.sh
index be397e3..c64228d 100644
--- a/lib/stages/prepare_build.sh
+++ b/lib/stages/prepare_build.sh
@@ -66,7 +66,7 @@ _stage_prepare_build() {
         composer require "${dev_dependency}" --dev --no-update --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}"
     done
 
-    composer require drush/drush --no-install --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}"
+    composer require drush/drush --no-update --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}"
 
     # Allow required plugins
     composer config allow-plugins.cweagans/composer-patches true --no-plugins --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}"