From 0fb385ce2b339deff9727aa5396a3d8158c70dea Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Sat, 2 Nov 2024 09:59:37 +0200 Subject: [PATCH 01/10] Add workflow_dispatch event --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6bbc9dc..9eda45f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,8 @@ name: ci -on: [push, pull_request] +on: + - push + - pull_request + - workflow_dispatch jobs: tests: runs-on: ubuntu-latest From 3b868aa44cc9db08352846688425c90498722d98 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Sat, 2 Nov 2024 10:02:08 +0200 Subject: [PATCH 02/10] docker-compose -> docker compose --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9eda45f..fc82b8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,21 +18,21 @@ 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 + 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 -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 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 From f18f8f1ac06d910aeaebdc70eefc03b96552a0ea Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Sat, 2 Nov 2024 10:07:16 +0200 Subject: [PATCH 03/10] Update Drupal versions --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc82b8f..ec6b0a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,13 @@ jobs: 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 }} From 8a99e76879c48ce6ded87815ae30f031b3d17cbc Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Sat, 2 Nov 2024 10:11:02 +0200 Subject: [PATCH 04/10] Update composer.json --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 456f4c8..1d533ca 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", From d6721d9adbfa910e1188f8626e2d32ddd638c2fa Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Sat, 2 Nov 2024 10:20:31 +0200 Subject: [PATCH 05/10] Drupal 11 moved out some modules --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec6b0a3..e9b6789 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,8 +29,11 @@ jobs: run: docker compose exec -T php php --version - name: composer self-update run: docker compose exec -T php composer self-update - - name: composer require + - 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 - name: composer install run: docker compose exec -T php composer install --no-progress --no-ansi --no-interaction - name: composer site:install From e8393d347b572825b76ae6275529acc18a4f0aff Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Sat, 2 Nov 2024 10:23:25 +0200 Subject: [PATCH 06/10] Add Drupal Composer repository --- composer.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1d533ca..61f02bf 100644 --- a/composer.json +++ b/composer.json @@ -56,5 +56,11 @@ "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": "composer", + "url": "https://packages.drupal.org/8" + } + ] } From 620bac50fc57a5c5b7b677f5a521299ec36a072f Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Sat, 2 Nov 2024 10:31:54 +0200 Subject: [PATCH 07/10] Tracker module is left behind --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9b6789..4f29be6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: 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 + run: docker compose exec -u ${DOCKER_USER_ID} -T php composer require --no-interaction --dev --no-update drupal/book drupal/forum drupal/statistics - name: composer install run: docker compose exec -T php composer install --no-progress --no-ansi --no-interaction - name: composer site:install From 4f07ec8d0fadea50c9cceaebbb6873538fa691fd Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Sat, 2 Nov 2024 10:42:39 +0200 Subject: [PATCH 08/10] Add installer path for contrib modules --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 61f02bf..4b06490 100644 --- a/composer.json +++ b/composer.json @@ -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": { From d5602e77979d1dc3e6c2204b89aa25ef2f45c6cf Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Sat, 2 Nov 2024 10:48:11 +0200 Subject: [PATCH 09/10] Use a dev branch of drupal/tracker --- .github/workflows/ci.yml | 2 +- composer.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f29be6..fc819eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: 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 + 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 - name: composer site:install diff --git a/composer.json b/composer.json index 4b06490..93dd0cd 100644 --- a/composer.json +++ b/composer.json @@ -59,6 +59,10 @@ "phpcs": "./vendor/bin/phpcs" }, "repositories": [ + { + "type": "vcs", + "url": "https://git.drupalcode.org/issue/tracker-3379544.git" + }, { "type": "composer", "url": "https://packages.drupal.org/8" From 345eb8c45de0b3c1c47364053a5a39e2cee689e7 Mon Sep 17 00:00:00 2001 From: Claudiu Cristea Date: Sat, 2 Nov 2024 10:52:22 +0200 Subject: [PATCH 10/10] Safer? --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc819eb..84c529a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: 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 + 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 - name: composer site:install