Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove outdated patches #76

Merged
merged 6 commits into from
Jan 11, 2024
Merged

Remove outdated patches #76

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6cd8eb
Remove outdated patches
chrfritsch Dec 20, 2023
439005f
Rename testing.yml to tests.yml
chrfritsch Dec 20, 2023
921711f
Update prepare_build.sh
chrfritsch Jan 9, 2024
3bd6bcf
Comment out SYMFONY_DEPRECATIONS_HELPER setting
alexpott Jan 9, 2024
d560f50
Revert "Comment out SYMFONY_DEPRECATIONS_HELPER setting"
alexpott Jan 10, 2024
70e4299
remove drush12 change
alexpott Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 .github/workflows/testing.yml → .github/workflows/tests.yml
View file
Open in desktop
File renamed without changes.
22 changes: 0 additions & 22 deletions lib/stages/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,6 @@ _stage_build() {
cd "${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}" || exit
composer update ${composer_arguments}

local installed_version
local major_version
local minor_version
installed_version=$(composer show 'drupal/core' | grep 'versions' | grep -o -E '[^ ]+$')
major_version="$(cut -d'.' -f1 <<<"${installed_version}")"
minor_version="$(cut -d'.' -f2 <<<"${installed_version}")"
if [[ ${major_version} -gt 8 ]] && [[ ${minor_version} -gt 1 ]]; then
# Apply core patch
local docroot
docroot=$(get_distribution_docroot)
cd "${docroot}" || exit
if [[ ${minor_version} -lt 3 ]]; then
wget https://www.drupal.org/files/issues/2021-10-05/3240601%2B3240813-9.2.x.patch -O 3240601.patch
patch -p1 < 3240601.patch

wget https://www.drupal.org/files/issues/2021-11-03/3032275-78.patch
patch -p1 < 3032275-78.patch
fi
cd - || exit
fi


# We can cleanup the name change now.
composer config name "${DRUPAL_TESTING_COMPOSER_NAME}" --working-dir="${DRUPAL_TESTING_PROJECT_BASEDIR}"

Expand Down
2 changes: 1 addition & 1 deletion lib/stages/prepare_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ _stage_prepare_build() {
composer require oomphinc/composer-installers-extender --no-update --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}"
fi

composer require drush/drush:"^11.2.0" --no-update --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}"
composer require drush/drush:"^12.0.0@stable" --no-update --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}"
alexpott marked this conversation as resolved.
Show resolved Hide resolved
composer require phpspec/prophecy-phpunit:^2 --dev --no-update --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}"

# Require phpstan.
Expand Down
Loading