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

Drupal 11 is the main stable branch #88

Merged
merged 4 commits into from
Oct 24, 2024
Merged

Drupal 11 is the main stable branch #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82670fa
Update config.contrib.yaml
claudiu-cristea Oct 22, 2024
e1415b5
chore: default to d11 for tests
hanoii Oct 23, 2024
dadd40b
tests: enable corepack by default
hanoii Oct 24, 2024
c252e84
docs: add corepack to the readme for d11
hanoii Oct 24, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ DDEV integration for developing Drupal contrib projects. As a general philosophy
1. If you haven't already, [install Docker and DDEV](https://ddev.readthedocs.io/en/latest/users/install/)
2. `git clone` your contrib module
3. cd [contrib module directory]
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`
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`
- Remove underscores in the project name, or replace with hyphens. (DDEV will do this for you in v1.23.5+)
- See [Misc](#misc) for help on using alternate versions of Drupal core.
5. Run `ddev get ddev/ddev-drupal-contrib`
Expand Down
2 changes: 1 addition & 1 deletion config.contrib.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
web_environment:
# To change the Drupal core version, see the README:
# https://github.com/ddev/ddev-drupal-contrib/blob/main/README.md#changing-the-drupal-core-version
- DRUPAL_CORE=^10
- DRUPAL_CORE=^11
- SIMPLETEST_DB=mysql://db:db@db/db
- SIMPLETEST_BASE_URL=http://web
- BROWSERTEST_OUTPUT_DIRECTORY=/tmp
Expand Down
2 changes: 1 addition & 1 deletion tests/_common.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ _common_setup() {
ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true
cp -R ${DIR}/tests/testdata/test_drupal_contrib/* ${TESTDIR}
cd ${TESTDIR}
ddev config --project-name=${PROJNAME} --project-type=drupal --docroot=web
ddev config --project-name=${PROJNAME} --project-type=drupal --docroot=web --php-version=8.3 --corepack-enable
if [ -n "$TEST_DRUPAL_CORE" ] && [ "$TEST_DRUPAL_CORE" != "default" ]; then
echo -e "web_environment:\n - DRUPAL_CORE=^${TEST_DRUPAL_CORE}" > .ddev/config.~overrides.yaml
fi
Expand Down
6 changes: 3 additions & 3 deletions tests/full.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ setup_file() {
fi
load '_common.bash'
_common_setup
ddev config --php-version=8.2
if [ "$TEST_DRUPAL_CORE" = "11" ]; then
ddev config --php-version=8.3 --corepack-enable
if [ "$TEST_DRUPAL_CORE" = "10" ]; then
# Test D10 with older PHP version and corepack-disabled
ddev config --php-version=8.2 --corepack-enable=false
fi
ddev start
}
Expand Down