Skip to content

Commit dfa4d3b

Browse files
Drupal 11 is the main stable branch (#88)
* Update config.contrib.yaml Drupal 11 is the main stable branch * chore: default to d11 for tests * tests: enable corepack by default * docs: add corepack to the readme for d11 --------- Co-authored-by: Ariel Barreiro <abarrei@gmail.com>
1 parent 7875f18 commit dfa4d3b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DDEV integration for developing Drupal contrib projects. As a general philosophy
1010
1. If you haven't already, [install Docker and DDEV](https://ddev.readthedocs.io/en/latest/users/install/)
1111
2. `git clone` your contrib module
1212
3. cd [contrib module directory]
13-
4. Configure DDEV for Drupal using `ddev config --project-type=drupal --docroot=web --php-version=8.3 --project-name=[module]` or select these options when prompted using `ddev config`
13+
4. Configure DDEV for Drupal using `ddev config --project-type=drupal --docroot=web --php-version=8.3 --corepack-enable --project-name=[module]` or select these options when prompted using `ddev config`
1414
- Remove underscores in the project name, or replace with hyphens. (DDEV will do this for you in v1.23.5+)
1515
- See [Misc](#misc) for help on using alternate versions of Drupal core.
1616
5. Run `ddev add-on get ddev/ddev-drupal-contrib` (or `ddev get ddev/ddev-drupal-contrib` if your DDEV version is older than 1.23.5)

config.contrib.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
web_environment:
44
# To change the Drupal core version, see the README:
55
# https://github.com/ddev/ddev-drupal-contrib/blob/main/README.md#changing-the-drupal-core-version
6-
- DRUPAL_CORE=^10
6+
- DRUPAL_CORE=^11
77
- SIMPLETEST_DB=mysql://db:db@db/db
88
- SIMPLETEST_BASE_URL=http://web
99
- BROWSERTEST_OUTPUT_DIRECTORY=/tmp

tests/_common.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ _common_setup() {
1010
ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true
1111
cp -R ${DIR}/tests/testdata/test_drupal_contrib/* ${TESTDIR}
1212
cd ${TESTDIR}
13-
ddev config --project-name=${PROJNAME} --project-type=drupal --docroot=web
13+
ddev config --project-name=${PROJNAME} --project-type=drupal --docroot=web --php-version=8.3 --corepack-enable
1414
if [ -n "$TEST_DRUPAL_CORE" ] && [ "$TEST_DRUPAL_CORE" != "default" ]; then
1515
echo -e "web_environment:\n - DRUPAL_CORE=^${TEST_DRUPAL_CORE}" > .ddev/config.~overrides.yaml
1616
fi

tests/full.bats

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ setup_file() {
77
fi
88
load '_common.bash'
99
_common_setup
10-
ddev config --php-version=8.2
11-
if [ "$TEST_DRUPAL_CORE" = "11" ]; then
12-
ddev config --php-version=8.3 --corepack-enable
10+
if [ "$TEST_DRUPAL_CORE" = "10" ]; then
11+
# Test D10 with older PHP version and corepack-disabled
12+
ddev config --php-version=8.2 --corepack-enable=false
1313
fi
1414
ddev start
1515
}

0 commit comments

Comments
 (0)