Skip to content

Commit

Permalink
Switch drupal-recommended to 11.0.x instead of 11.x (#5993)
Browse files Browse the repository at this point in the history
* switch drupal-recommended to 11.0.x instead of 11.x

* Change D11 to 11.0.x from 11.x

* CI too

* Bump mysql version

* Ignore composer.lock

* Change prefer-stable. Only affects Drush developers

* Bump DCG
  • Loading branch information
weitzman committed May 8, 2024
1 parent 334e986 commit ca0cbf6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8,422 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ executors:
environment:
- MYSQL_HOST=127.0.0.1
- UNISH_DB_URL=mysql://root:@127.0.0.1/unish_dev?module=mysql
- image: cimg/mysql:5.7.38
- image: cimg/mysql:8.0
postgres-lowest:
docker:
- image: wodby/php:$WODBY_TAG
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
- equal: [ lowest, << parameters.release >> ]
steps:
- run: composer -n config platform.php --unset
- run: composer -n require --dev drupal/core-recommended:11.x-dev --no-update
- run: composer -n require --dev drupal/core-recommended:11.0.x-dev --no-update
- run: composer -n update
- run: composer -n unit -- --log-junit /tmp/results/unit/junit.xml
- run: composer -n << parameters.suite >> -- --log-junit /tmp/results/<< parameters.suite >>/junit.xml
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Drush uses highest/lowest testing so no use for a lock file.
composer.lock
tests/phpunit.xml
.ddev/config.personal.yaml
vendor
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"homepage": "http://www.drush.org",
"license": "GPL-2.0-or-later",
"minimum-stability": "dev",
"prefer-stable": true,
"prefer-stable": false,
"authors": [
{ "name": "Moshe Weitzman", "email": "weitzman@tejasa.com" },
{ "name": "Owen Barton", "email": "drupal@owenbarton.com" },
Expand Down Expand Up @@ -33,7 +33,7 @@
"php": ">=8.2",
"ext-dom": "*",
"composer-runtime-api": "^2.2",
"chi-teck/drupal-code-generator": "^3 || 4.x-dev",
"chi-teck/drupal-code-generator": "^3.5 || 4.x-dev",
"composer/semver": "^1.4 || ^3",
"consolidation/annotated-command": "^4.9.2",
"consolidation/config": "^2.1.2 || ^3",
Expand All @@ -57,11 +57,11 @@
"require-dev": {
"composer/installers": "^2",
"cweagans/composer-patches": "~1.7.3",
"drupal/core-recommended": "^10.2.5 || 11.x-dev",
"drupal/core-recommended": "^10.2.5 || 11.0.x-dev",
"drupal/semver_example": "2.3.0",
"jetbrains/phpstorm-attributes": "^1.0",
"mglaman/phpstan-drupal": "^1.2",
"phpunit/phpunit": "^9",
"phpunit/phpunit": "^9 || ^10",
"rector/rector": "^1",
"squizlabs/php_codesniffer": "^3.7"
},
Expand Down

0 comments on commit ca0cbf6

Please sign in to comment.