Skip to content

Commit

Permalink
Fix site install command D11 compat (#5883)
Browse files Browse the repository at this point in the history
  • Loading branch information
mondrake authored Mar 8, 2024
1 parent f9186d6 commit 39e5592
Show file tree
Hide file tree
Showing 10 changed files with 780 additions and 689 deletions.
31 changes: 17 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,25 @@ executors:
- image: wodby/php:$WODBY_TAG
environment:
- MYSQL_HOST=127.0.0.1
- UNISH_DB_URL=mysql://root:@127.0.0.1
- UNISH_DB_URL=mysql://root:@127.0.0.1/unish_dev?module=mysql
- image: cimg/mysql:5.7.38
sqlite-stable:
docker:
- image: wodby/php:$WODBY_TAG
environment:
- "UNISH_DB_URL=sqlite://:memory:"
sqlite-highest:
- "UNISH_DB_URL=sqlite://localhost/:memory:?module=sqlite"
mysql-highest:
docker:
- image: wodby/php:latest
environment:
- "UNISH_DB_URL=sqlite://:memory:"
- 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
postgres-stable:
docker:
- image: wodby/php:$WODBY_TAG
environment:
- UNISH_DB_URL=pgsql://unish:[email protected]
- UNISH_DB_URL=pgsql://unish:[email protected]/unish_dev?module=pgsql
- image: wodby/postgres:14
environment:
POSTGRES_DB_EXTENSIONS: pg_trgm
Expand Down Expand Up @@ -97,17 +99,18 @@ jobs:
- when:
condition:
and:
- equal: [ stable, << parameters.release >> ]
- equal: [ stable, << parameters.release >> ]
steps:
- run: composer -n install
- unless:
condition:
and:
- equal: [ stable, << parameters.release >> ]
- equal: [ stable, << parameters.release >> ]
steps:
- run: composer -n config platform.php --unset
- run: composer -n require --dev drupal/core-recommended:10.1.x-dev --no-update
- run: composer -n require --dev drupal/core-recommended:11.x-dev --no-update
- run: composer -n update
- run: composer -n require chi-teck/drupal-code-generator:3.x-dev
- 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 All @@ -118,7 +121,7 @@ jobs:
# - image: wodby/php:8.0
# environment:
# - MYSQL_HOST=127.0.0.1
# - UNISH_DB_URL=mysql://root:@127.0.0.1
# - UNISH_DB_URL=mysql://root:@127.0.0.1/unish_dev?module=mysql
# - image: cimg/mysql:5.7.38
# steps:
# - checkout
Expand All @@ -142,19 +145,19 @@ workflows:
parameters:
dbms: [sqlite, mysql, postgres]
suite: [integration, functional]
release: [stable] # highest is temporarily disabled.
release: [stable, highest]
exclude:
# Only run highest test on sqlite. Excluding each suite is unfortnate but needed.
# Only run highest test on sqlite. Excluding each suite is unfortunate but needed.
- release: highest
dbms: mysql
dbms: sqlite
suite: integration
- release: highest
dbms: mysql
dbms: sqlite
suite: functional
- release: highest
dbms: postgres
suite: integration
- release: highest
dbms: postgres
suite: functional
suite: functional

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"require-dev": {
"composer/installers": "^2",
"cweagans/composer-patches": "~1.0",
"drupal/core-recommended": "^10",
"drupal/core-recommended": "^10.2.4",
"drupal/semver_example": "2.3.0",
"phpunit/phpunit": "^9",
"rector/rector": "^0.12",
Expand Down
Loading

0 comments on commit 39e5592

Please sign in to comment.