diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6bbc9dc..84c529a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,13 +1,21 @@ name: ci -on: [push, pull_request] +on: + - push + - pull_request + - workflow_dispatch jobs: tests: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - php_version: ["8.1", "8.2"] - drupal_version: ["~10.0", "~10.1"] + php_version: ["8.1", "8.2", "8.3"] + drupal_version: ["^10.3", "^11"] + exclude: + - drupal_version: "^11" + php_version: "8.1" + - drupal_version: "^11" + php_version: "8.2" env: PHP_VERSION: ${{ matrix.php_version }} DRUPAL_VERSION: ${{ matrix.drupal_version }} @@ -15,21 +23,24 @@ jobs: steps: - name: clone uses: actions/checkout@v3 - - name: docker-compose up -d - run: docker-compose up -d + - name: docker compose up -d + run: docker compose up -d - name: php --version - run: docker-compose exec -T php php --version + run: docker compose exec -T php php --version - name: composer self-update - run: docker-compose exec -T php composer self-update - - name: composer require - run: docker-compose exec -u ${DOCKER_USER_ID} -T php composer require --no-interaction --dev --no-update drupal/core:${DRUPAL_VERSION} drupal/core-composer-scaffold:${DRUPAL_VERSION} + run: docker compose exec -T php composer self-update + - name: composer require core + run: docker compose exec -u ${DOCKER_USER_ID} -T php composer require --no-interaction --dev --no-update drupal/core:${DRUPAL_VERSION} drupal/core-composer-scaffold:${DRUPAL_VERSION} + - name: composer require contrib + if: matrix.drupal_version == '^11' + run: docker compose exec -u ${DOCKER_USER_ID} -T php composer require --no-interaction --dev --no-update drupal/book drupal/forum drupal/statistics drupal/tracker:"dev-3379544-tracker-needs-to" - name: composer install - run: docker-compose exec -T php composer install --no-progress --no-ansi --no-interaction + run: docker compose exec -T php composer install --no-progress --no-ansi --no-interaction - name: composer site:install - run: docker-compose exec -T php composer site:install + run: docker compose exec -T php composer site:install - name: drush status - run: docker-compose exec -T php ./vendor/bin/drush status + run: docker compose exec -T php ./vendor/bin/drush status - name: composer phpcs - run: docker-compose exec -T php composer phpcs + run: docker compose exec -T php composer phpcs - name: composer phpunit - run: docker-compose exec -T php composer phpunit + run: docker compose exec -T php composer phpunit diff --git a/composer.json b/composer.json index 456f4c8..93dd0cd 100644 --- a/composer.json +++ b/composer.json @@ -19,13 +19,13 @@ } }, "require": { - "drush/drush": "^11.0 || ^12.0" + "drush/drush": "^12.5 || ^13.3" }, "require-dev": { "composer/installers": "^2", "drupal/core-composer-scaffold": ">=10.0", - "drupal/core-recommended": ">=10.0", - "phpunit/phpunit": "^9.6", + "drupal/core-recommended": "^10.3 || ^11", + "phpunit/phpunit": "^9.6 || ^10.5", "squizlabs/php_codesniffer": "^3.7" }, "minimum-stability": "dev", @@ -39,7 +39,8 @@ }, "extra": { "installer-paths": { - "build/core": ["type:drupal-core"] + "build/core": ["type:drupal-core"], + "build/modules/contrib/{$name}": ["type:drupal-module"] }, "drupal-scaffold": { "locations": { @@ -56,5 +57,15 @@ "site:install": "./vendor/bin/drush site:install testing --root=build --sites-subdir=default --db-url=sqlite://sites/default/files/.ht.sqlite --yes", "phpunit": "./vendor/bin/phpunit tests", "phpcs": "./vendor/bin/phpcs" - } + }, + "repositories": [ + { + "type": "vcs", + "url": "https://git.drupalcode.org/issue/tracker-3379544.git" + }, + { + "type": "composer", + "url": "https://packages.drupal.org/8" + } + ] }