From 388fa2f94ed9912eda987ec128fd56894b786423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= Date: Wed, 3 Jul 2024 15:02:09 -0400 Subject: [PATCH 1/8] Try to test Drupal compatibility against Drupal 11 as well --- .github/workflows/drupal.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/drupal.yml b/.github/workflows/drupal.yml index 11682c2..c84a51c 100644 --- a/.github/workflows/drupal.yml +++ b/.github/workflows/drupal.yml @@ -16,10 +16,14 @@ jobs: fail-fast: false max-parallel: 10 matrix: - php: ['8.1', '8.2', '8.3'] + php: [8.1, 8.2, 8.3] template: - recommended-project - legacy-project + core_version: + - ^10 + - ^11 + if: ${{ matrix.core_version == "^10" || ( matrix.core_version == "^11" && matrix.php >= 8.3 ) }} steps: - name: Checkout self @@ -35,7 +39,7 @@ jobs: - name: Create Drupal project run: | - composer create-project drupal/${{ matrix.template }} project + composer create-project drupal/${{ matrix.template }}:${{ matrix.core_version }} project cd project composer config --no-plugins allow-plugins.php-tuf/composer-integration true composer config repositories.local path ../composer-integration From d88f2db36442f41dd3f1d06b305d1e1a06886b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= Date: Wed, 3 Jul 2024 15:03:31 -0400 Subject: [PATCH 2/8] Try to fix syntax --- .github/workflows/drupal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/drupal.yml b/.github/workflows/drupal.yml index c84a51c..6e9bf71 100644 --- a/.github/workflows/drupal.yml +++ b/.github/workflows/drupal.yml @@ -23,7 +23,7 @@ jobs: core_version: - ^10 - ^11 - if: ${{ matrix.core_version == "^10" || ( matrix.core_version == "^11" && matrix.php >= 8.3 ) }} + if: ${{ matrix.core_version }} == "^10" || ( ${{ matrix.core_version }} == "^11" && ${{ matrix.php }} >= 8.3 ) steps: - name: Checkout self From ec4a6327b025c38aa4bdbf65ed8802f0c45a707d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= Date: Wed, 3 Jul 2024 15:09:16 -0400 Subject: [PATCH 3/8] Use matrix exclude --- .github/workflows/drupal.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/drupal.yml b/.github/workflows/drupal.yml index 6e9bf71..6cb6118 100644 --- a/.github/workflows/drupal.yml +++ b/.github/workflows/drupal.yml @@ -16,14 +16,15 @@ jobs: fail-fast: false max-parallel: 10 matrix: - php: [8.1, 8.2, 8.3] + php: ['8.1', '8.2', '8.3'] template: - recommended-project - legacy-project - core_version: - - ^10 - - ^11 - if: ${{ matrix.core_version }} == "^10" || ( ${{ matrix.core_version }} == "^11" && ${{ matrix.php }} >= 8.3 ) + core: ['^10', '^11'] + # Drupal 11's minimum PHP version is 8.3. + exclude: + - { core: ^11, php: 8.1 } + - { core: ^11, php: 8.2 } steps: - name: Checkout self @@ -39,7 +40,7 @@ jobs: - name: Create Drupal project run: | - composer create-project drupal/${{ matrix.template }}:${{ matrix.core_version }} project + composer create-project drupal/${{ matrix.template }}:${{ matrix.core }} project cd project composer config --no-plugins allow-plugins.php-tuf/composer-integration true composer config repositories.local path ../composer-integration From 7e0ff23608677943ace0d293f4a108691ee51951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= Date: Wed, 3 Jul 2024 15:10:20 -0400 Subject: [PATCH 4/8] Name --- .github/workflows/drupal.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/drupal.yml b/.github/workflows/drupal.yml index 6cb6118..0d81f7b 100644 --- a/.github/workflows/drupal.yml +++ b/.github/workflows/drupal.yml @@ -10,7 +10,7 @@ on: jobs: composer-project: - name: ${{ matrix.template }} on PHP ${{ matrix.php }} + name: ${{ matrix.template }} ${{ matrix.core }}.x on PHP ${{ matrix.php }} runs-on: ubuntu-latest strategy: fail-fast: false @@ -20,11 +20,11 @@ jobs: template: - recommended-project - legacy-project - core: ['^10', '^11'] + core: [10, 11] # Drupal 11's minimum PHP version is 8.3. exclude: - - { core: ^11, php: 8.1 } - - { core: ^11, php: 8.2 } + - { core: 11, php: 8.1 } + - { core: 11, php: 8.2 } steps: - name: Checkout self @@ -40,7 +40,7 @@ jobs: - name: Create Drupal project run: | - composer create-project drupal/${{ matrix.template }}:${{ matrix.core }} project + composer create-project drupal/${{ matrix.template }}:^${{ matrix.core }} project cd project composer config --no-plugins allow-plugins.php-tuf/composer-integration true composer config repositories.local path ../composer-integration From d3da546f3db4fd00bd7c34e0eb839e1b89e39085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= Date: Wed, 3 Jul 2024 15:11:31 -0400 Subject: [PATCH 5/8] Use beta flag --- .github/workflows/drupal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/drupal.yml b/.github/workflows/drupal.yml index 0d81f7b..3ed8a54 100644 --- a/.github/workflows/drupal.yml +++ b/.github/workflows/drupal.yml @@ -20,7 +20,7 @@ jobs: template: - recommended-project - legacy-project - core: [10, 11] + core: [10, 11@beta] # Drupal 11's minimum PHP version is 8.3. exclude: - { core: 11, php: 8.1 } @@ -40,7 +40,7 @@ jobs: - name: Create Drupal project run: | - composer create-project drupal/${{ matrix.template }}:^${{ matrix.core }} project + composer create-project drupal/${{ matrix.template }}:^${{ matrix.core }}@beta project cd project composer config --no-plugins allow-plugins.php-tuf/composer-integration true composer config repositories.local path ../composer-integration From 13b008474c0682407f90732b9c7bd23a86a1d3e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= Date: Wed, 3 Jul 2024 15:11:49 -0400 Subject: [PATCH 6/8] Use dev flag instead --- .github/workflows/drupal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/drupal.yml b/.github/workflows/drupal.yml index 3ed8a54..321bc21 100644 --- a/.github/workflows/drupal.yml +++ b/.github/workflows/drupal.yml @@ -20,7 +20,7 @@ jobs: template: - recommended-project - legacy-project - core: [10, 11@beta] + core: [10, 11] # Drupal 11's minimum PHP version is 8.3. exclude: - { core: 11, php: 8.1 } @@ -40,7 +40,7 @@ jobs: - name: Create Drupal project run: | - composer create-project drupal/${{ matrix.template }}:^${{ matrix.core }}@beta project + composer create-project drupal/${{ matrix.template }}:^${{ matrix.core }}@dev project cd project composer config --no-plugins allow-plugins.php-tuf/composer-integration true composer config repositories.local path ../composer-integration From 7e2f9904da94bc01630e8a3b9d5a9b1a0df36048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= Date: Wed, 3 Jul 2024 16:20:57 -0400 Subject: [PATCH 7/8] Temporarily use PHP-TUF dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dd4f868..51d38b3 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "minimum-stability": "stable", "require": { "composer-plugin-api": "^2.6", - "php-tuf/php-tuf": "0.1.5", + "php-tuf/php-tuf": "dev-main", "guzzlehttp/psr7": "^2.4" }, "autoload": { From 8c2864189abc5ee5845230164dfe03563492eec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= Date: Tue, 9 Jul 2024 14:44:23 -0400 Subject: [PATCH 8/8] Update TUF --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 51d38b3..bffdecb 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "minimum-stability": "stable", "require": { "composer-plugin-api": "^2.6", - "php-tuf/php-tuf": "dev-main", + "php-tuf/php-tuf": "0.1.6", "guzzlehttp/psr7": "^2.4" }, "autoload": {