Skip to content

Commit a1fda8e

Browse files
committed
Attempt 2
1 parent 19eafda commit a1fda8e

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/pr.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,30 +113,30 @@ 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:^10 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_get_organized
119-
120-
composer --working-dir=drupal --no-interaction config minimum-stability dev
119+
cp -r os2forms_get_organized.* composer.json src drupal/web/modules/contrib/os2forms_get_organized
121120
122121
# Allow all plugins
123122
composer --working-dir=drupal config --no-plugins allow-plugins true
124123
125124
# Add our module as a composer repository.
126-
composer --no-interaction --working-dir=drupal config repositories.os2forms/os2forms_get_organized path web/modules/contrib/os2forms_get_organized
125+
composer --working-dir=drupal --no-interaction config --append repositories.os2forms/os2forms_get_organized path web/modules/contrib/os2forms_get_organized
126+
127127
# Restore Drupal composer repository.
128-
# composer --no-interaction --working-dir=drupal config repositories.drupal composer https://packages.drupal.org/8
128+
composer --no-interaction --working-dir=drupal config repositories.drupal composer https://packages.drupal.org/8
129129
130130
# Make Drupal 10 compatible
131131
composer --working-dir=drupal --no-interaction require psr/http-message:^1.0
132132
composer --working-dir=drupal --no-interaction require 'mglaman/composer-drupal-lenient'
133133
composer --working-dir=drupal config --no-plugins --merge --json extra.drupal-lenient.allowed-list '["drupal/coc_forms_auto_export", "drupal/webform_node_element"]'
134134
135135
# Require our module.
136-
composer --no-interaction --working-dir=drupal require 'os2forms/os2forms_get_organized:*'
136+
composer --working-dir=drupal --no-interaction require 'os2forms/os2forms_get_organized:*'
137137
138138
# Check code
139-
composer --no-interaction --working-dir=drupal require --dev drupal/core-dev
139+
composer --working-dir=drupal --no-interaction require --dev drupal/core-dev
140140
cd drupal/web/modules/contrib/os2forms_get_organized
141141
# Remove our non-dev dependencies to prevent duplicated Drupal installation
142142
# PHP Fatal error: Cannot redeclare drupal_get_filename() (previously declared in /home/runner/work/os2forms_get_organized/os2forms_get_organized/drupal/web/modules/contrib/os2forms_get_organized/vendor/drupal/core/includes/bootstrap.inc:190) in /home/runner/work/os2forms_get_organized/os2forms_get_organized/drupal/web/core/includes/bootstrap.inc on line 190

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"os2forms/os2forms": "^3.17"
2626
},
2727
"require-dev": {
28-
"dealerdirect/phpcodesniffer-composer-installer": "^1.0",
2928
"drupal/coder": "^8.3",
29+
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
3030
"mglaman/drupal-check": "^1.4",
3131
"mglaman/phpstan-drupal": "~1.2.0"
3232
},

0 commit comments

Comments
 (0)