Skip to content

Commit ddf1c6f

Browse files
committed
Cleanup actions and drupal lenient
1 parent 9651bfd commit ddf1c6f

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

.github/workflows/pr.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
strategy:
2525
matrix:
26-
php-versions: [ '8.1' ]
26+
php-versions: [ '8.3' ]
2727
dependency-version: [ prefer-lowest, prefer-stable ]
2828
steps:
2929
- uses: actions/checkout@master
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
strategy:
5757
matrix:
58-
php-versions: [ '8.1' ]
58+
php-versions: [ '8.3' ]
5959
dependency-version: [ prefer-lowest, prefer-stable ]
6060
steps:
6161
- uses: actions/checkout@master
@@ -88,7 +88,7 @@ jobs:
8888
runs-on: ubuntu-latest
8989
strategy:
9090
matrix:
91-
php-versions: [ '8.1' ]
91+
php-versions: [ '8.3' ]
9292
dependency-version: [ prefer-lowest, prefer-stable ]
9393
steps:
9494
- uses: actions/checkout@master
@@ -113,18 +113,24 @@ jobs:
113113
run: |
114114
# We need a Drupal project to run drupal-check (cf. https://github.com/mglaman/drupal-check#usage)
115115
# Install Drupal
116-
composer --no-interaction create-project drupal/recommended-project:^9 --stability=dev drupal
116+
composer --no-interaction create-project drupal/recommended-project:^10 --stability=dev drupal
117117
# Copy our module source code into the Drupal module folder.
118118
mkdir -p drupal/web/modules/contrib/os2forms_rest_api
119119
cp -r os2forms_rest_api.* composer.json src drupal/web/modules/contrib/os2forms_rest_api
120+
121+
# Allow all plugins
122+
composer --working-dir=drupal config --no-plugins allow-plugins true
123+
120124
# Add our module as a composer repository.
121125
composer --no-interaction --working-dir=drupal config repositories.os2forms/os2forms_rest_api path web/modules/contrib/os2forms_rest_api
126+
122127
# Restore Drupal composer repository.
123128
composer --no-interaction --working-dir=drupal config repositories.drupal composer https://packages.drupal.org/8
124129
125-
composer --no-interaction --working-dir=drupal config --no-plugins allow-plugins.cweagans/composer-patches true
126-
composer --no-interaction --working-dir=drupal config --no-plugins allow-plugins.zaporylie/composer-drupal-optimizations true
127-
composer --no-interaction --working-dir=drupal config --no-plugins allow-plugins.simplesamlphp/composer-module-installer true
130+
# Make Drupal 10 compatible
131+
composer --working-dir=drupal --no-interaction require psr/http-message:^1.0
132+
composer --working-dir=drupal --no-interaction require 'mglaman/composer-drupal-lenient'
133+
composer --working-dir=drupal config --no-plugins --merge --json extra.drupal-lenient.allowed-list '["drupal/coc_forms_auto_export", "drupal/webform_node_element"]'
128134
129135
# @see https://getcomposer.org/doc/03-cli.md#modifying-extra-values
130136
composer --no-interaction --working-dir=drupal config --no-plugins --json extra.enable-patching true

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454
"dealerdirect/phpcodesniffer-composer-installer": true,
5555
"cweagans/composer-patches": true,
5656
"zaporylie/composer-drupal-optimizations": true,
57-
"simplesamlphp/composer-module-installer": true
57+
"simplesamlphp/composer-module-installer": true,
58+
"mglaman/composer-drupal-lenient": true
5859
}
5960
},
6061
"extra": {

0 commit comments

Comments
 (0)