From 353bb7b641420c60ee33d2fad98c6ede1f1eaadc Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 8 Apr 2025 09:55:24 +0200 Subject: [PATCH 1/7] D11 compatibility --- composer.json | 10 ++++------ recipes/.gitignore | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 recipes/.gitignore diff --git a/composer.json b/composer.json index ad2ab53..f4df818 100644 --- a/composer.json +++ b/composer.json @@ -70,15 +70,12 @@ "burdamagazinorg/image-derive-all": "dev-master", "oomphinc/composer-installers-extender": "^1.1||^2.0", "netcarver/textile": "^3.7", - "drupal/config_profile": "^1.0", "drupal/default_content": "2.0.x-dev", "mglaman/composer-drupal-lenient": "^1.0" }, "require-dev": { - "drupal/core-dev": "^9 || ^10", - "phpspec/prophecy-phpunit": "^2", - "brianium/paratest": "^6.3", - "drupal/ckeditor5_dev": "^1.0" + "drupal/core-dev": "^10 || ^11", + "phpspec/prophecy-phpunit": "^2" }, "replace": { "drupal/paragraphs_features": "*", @@ -174,7 +171,8 @@ "dealerdirect/phpcodesniffer-composer-installer": true, "phpstan/extension-installer": true, "php-http/discovery": true, - "mglaman/composer-drupal-lenient": true + "mglaman/composer-drupal-lenient": true, + "tbachert/spi": true } } } diff --git a/recipes/.gitignore b/recipes/.gitignore new file mode 100644 index 0000000..739a339 --- /dev/null +++ b/recipes/.gitignore @@ -0,0 +1 @@ +/README.txt \ No newline at end of file From 85f1278c44501882ba5f44df2499c7b34b034688 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 8 Apr 2025 10:01:20 +0200 Subject: [PATCH 2/7] Update module versions --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f4df818..b4d82f8 100644 --- a/composer.json +++ b/composer.json @@ -150,10 +150,10 @@ "merge-extra-deep": true }, "local-develop-packages": { - "thunder/thunder-distribution": "7.2.x", + "thunder/thunder-distribution": "8.0.x", "drupal/paragraphs_features": "2.x", "drupal/paragraphs_paste": "2.x", - "drupal/select2": "8.x-1.x", + "drupal/select2": "2.x", "drupal/ivw_integration": "8.x-2.x", "drupal/update_helper": "4.0.x", "thunder/thunder_testing_demo": "4.x" From 166a64a9a3bac77f8f89e139668498b8d5a0e229 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 8 Apr 2025 10:12:54 +0200 Subject: [PATCH 3/7] Add tour --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index b4d82f8..54d6145 100644 --- a/composer.json +++ b/composer.json @@ -75,6 +75,7 @@ }, "require-dev": { "drupal/core-dev": "^10 || ^11", + "drupal/tour": "^2.0", "phpspec/prophecy-phpunit": "^2" }, "replace": { From e48c4dfac401c35ee001aa4d6f6cb7ce6d7284fe Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 8 Apr 2025 10:51:42 +0200 Subject: [PATCH 4/7] Rename file --- .github/workflows/{tests.yml => test.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{tests.yml => test.yml} (100%) diff --git a/.github/workflows/tests.yml b/.github/workflows/test.yml similarity index 100% rename from .github/workflows/tests.yml rename to .github/workflows/test.yml From 9350a87fa3c8609df38b20194ab283d0f632ed59 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 8 Apr 2025 11:02:55 +0200 Subject: [PATCH 5/7] New cache --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ecf3d1..2dacb27 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: mysql -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';" - name: Cache composer dependencies - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.composer/cache key: ${{ runner.os }}-composer-cache-${{ hashFiles('**/composer.json') }} From e775edfaad1815b428eff6de61a61ed53eb44be1 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 8 Apr 2025 11:10:13 +0200 Subject: [PATCH 6/7] Use 8.3 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2dacb27..0051135 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: coverage: none - php-version: '8.1' + php-version: '8.3' extensions: Imagick - name: Start MySql service From 393adf968d65e68f17b85004eba8b8486eee864c Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 8 Apr 2025 11:12:26 +0200 Subject: [PATCH 7/7] Update --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0051135..b851a9b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4