From 686707b380badd21ca3cb896f4855230513ffbca Mon Sep 17 00:00:00 2001 From: Bosen Daniel Date: Mon, 19 Jun 2023 10:30:34 +0200 Subject: [PATCH 01/10] Drush 12 --- composer.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index bcc7aaf..7d198a0 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "thunder/thunder-distribution": "7.0@STABLE", "drupal/core-composer-scaffold": "^10.0", "composer/installers": "^1.2", - "drush/drush": "^11.0", + "drush/drush": "^12.0", "vlucas/phpdotenv": "^2.4", "oomphinc/composer-installers-extender": "^2.0" }, @@ -74,6 +74,14 @@ }, "config": { "sort-packages": true, - "process-timeout": 2000 + "process-timeout": 2000, + "allow-plugins": { + "composer/installers": true, + "dealerdirect/phpcodesniffer-composer-installer": true, + "cweagans/composer-patches": true, + "phpstan/extension-installer": true, + "drupal/core-composer-scaffold": true, + "oomphinc/composer-installers-extender": true + } } } From 7da4a74016f99dc4f86d4758fffb35c4194c1f29 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Mon, 19 Jun 2023 15:04:19 +0200 Subject: [PATCH 02/10] Update composer.json --- composer.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 7d198a0..be83b89 100644 --- a/composer.json +++ b/composer.json @@ -74,14 +74,6 @@ }, "config": { "sort-packages": true, - "process-timeout": 2000, - "allow-plugins": { - "composer/installers": true, - "dealerdirect/phpcodesniffer-composer-installer": true, - "cweagans/composer-patches": true, - "phpstan/extension-installer": true, - "drupal/core-composer-scaffold": true, - "oomphinc/composer-installers-extender": true - } + "process-timeout": 2000 } } From c34751ad0477a92c5e21192f7d55d0f5bc0d3044 Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Mon, 19 Jun 2023 15:08:25 +0200 Subject: [PATCH 03/10] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index be83b89..2147c78 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "thunder/thunder-distribution": "7.0@STABLE", "drupal/core-composer-scaffold": "^10.0", "composer/installers": "^1.2", - "drush/drush": "^12.0", + "drush/drush": "^12.1", "vlucas/phpdotenv": "^2.4", "oomphinc/composer-installers-extender": "^2.0" }, From 375305ed37388bab8a1765c09ba7295fa2cf7ca3 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 9 Jan 2024 17:02:43 +0100 Subject: [PATCH 04/10] Rename test.yml to tests.yml --- .github/workflows/{test.yml => tests.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test.yml => tests.yml} (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/tests.yml similarity index 100% rename from .github/workflows/test.yml rename to .github/workflows/tests.yml From bd9df5161097d42b8395f83ed5af88b85f4324c0 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 9 Jan 2024 17:03:53 +0100 Subject: [PATCH 05/10] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5c19e37..0284b0d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,7 +3,7 @@ name: Test composer install on: pull_request: branches: - - 3.x + - 4.x jobs: build: From 068f686ba1a641c74b4b14f1c660c040f7451d29 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 9 Jan 2024 17:07:29 +0100 Subject: [PATCH 06/10] Update tests.yml --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0284b0d..aa0e3e7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,7 +3,7 @@ name: Test composer install on: pull_request: branches: - - 4.x + - *.x jobs: build: @@ -16,7 +16,7 @@ jobs: - uses: shivammathur/setup-php@v2 with: coverage: none - php-version: 8.0 + php-version: 8.1 extensions: Imagick, gd, pdo_mysql - name: Cache composer dependencies From 0d0c0995bbdadd7281ded3c2e1874a83a3e31a0a Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 9 Jan 2024 17:10:33 +0100 Subject: [PATCH 07/10] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aa0e3e7..7f57843 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,7 +3,7 @@ name: Test composer install on: pull_request: branches: - - *.x + - [3-9].x jobs: build: From 73e9004a20fdf0542c62b627fc22a7d870cf4448 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 9 Jan 2024 17:11:38 +0100 Subject: [PATCH 08/10] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7f57843..a389d38 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,7 +3,7 @@ name: Test composer install on: pull_request: branches: - - [3-9].x + - 4.x jobs: build: From a55a33894682db94c32647de5a528ddc715dcb8d Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 9 Jan 2024 18:03:37 +0100 Subject: [PATCH 09/10] Update composer.json --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2147c78..371b23e 100644 --- a/composer.json +++ b/composer.json @@ -74,6 +74,9 @@ }, "config": { "sort-packages": true, - "process-timeout": 2000 + "process-timeout": 2000, + "allow-plugins": { + "phpstan/extension-installer": true + } } } From bfb63123f432c849c8813cc213631c0fa352acc0 Mon Sep 17 00:00:00 2001 From: Christian Fritsch Date: Tue, 9 Jan 2024 17:12:13 +0000 Subject: [PATCH 10/10] Move composer plugin to workflow --- .github/workflows/tests.yml | 1 + composer.json | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a389d38..96547ec 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,6 +38,7 @@ jobs: composer config allow-plugins.composer/installers true --no-plugins composer config allow-plugins.oomphinc/composer-installers-extender true --no-plugins composer config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true --no-plugins + composer config allow-plugins.phpstan/extension-installer true --no-plugins - name: Install dependencies run: composer install diff --git a/composer.json b/composer.json index 371b23e..2147c78 100644 --- a/composer.json +++ b/composer.json @@ -74,9 +74,6 @@ }, "config": { "sort-packages": true, - "process-timeout": 2000, - "allow-plugins": { - "phpstan/extension-installer": true - } + "process-timeout": 2000 } }