Usher updates (#244)

* Bring Usher up to date.
* Update Usher CI files
* allow drupal core-composer-scaffold plugin
* Allow for more versions of async-aws/s3

Author: apotek

.github/workflows/backport-merged-pr.yml

@@ -28,8 +28,8 @@ jobs:
         contains(github.event.comment.body, '/backport')
       )
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Create backport pull requests
-        uses: korthout/backport-action@v3
+        uses: korthout/backport-action@v4
         with:
           github_token: ${{ secrets.USHER_BACKPORT_PAT }}

.github/workflows/ci.yml

@@ -16,10 +16,10 @@ jobs:
         php: [8.1, 8.2, 8.3]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.32.0
+        uses: shivammathur/setup-php@2.36.0
         with:
           php-version: ${{ matrix.php }}
 
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: YAML lint
         uses: ibiqlik/action-yamllint@v3.1

README.md

@@ -14,9 +14,10 @@ downstream repos.
 
 | Usher Version | PHP | Drupal | Notes |
 | --- | --- | --- | --- |
-| 4.x | 8.1+ | 9.5 - 10.1+ | **Active development**
+| 5.x | 8.1+ | 9.5 - 11.0+ | **Active development**
+| 4.x | 8.1+ | 9.5 - 10.1+ | **Minimally maintained**
 | 3.x | 8.1+ | 9.5 - 10.1+ | **Minimally maintained**
-| 2.x | 7.4 - 8.1 | 7, 9.4 - 10.0 | **Minimally maintained**
+| 2.x | 7.4 - 8.1 | 7, 9.4 - 10.0 | **Unsupported**
 | 1.x | 7.4 | 7, 8 | **Unsupported**
 
 ## Installation

composer.json

@@ -21,7 +21,7 @@
         "consolidation/robo": "^1.4 || ^2 || ^3 || ^4 || ^5",
         "squizlabs/php_codesniffer": "^3.5",
         "phpstan/phpstan-deprecation-rules": "^0.12.6 || ^1.0.0 || ^2.0.0",
-        "async-aws/s3": "^1.8 || ^2.0",
+        "async-aws/s3": "^1.8 || ^2.0 || ^3.0",
         "php": ">=8.1",
         "drush/drush": "^8 || ^10 || ^11 || ^12 || ^13",
         "webflo/drupal-finder": "^1.2",
@@ -31,7 +31,7 @@
         "phpcompatibility/php-compatibility": "^9.3",
         "guzzlehttp/guzzle": "^5.0 || ^6.0 || ^7.0",
         "rector/rector": "^0.16.0 || ^0.17.0 || ^0.18.0 || ^0.19.0 || ^1.0.0 || ^2.0.0",
-        "symfony/yaml": "^6.3 || ^7.0"
+        "symfony/yaml": "^6.3 || ^7.0 || ^8.0"
     },
     "autoload": {
         "psr-4": {
@@ -55,7 +55,8 @@
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "phpstan/extension-installer": true,
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "drupal/core-composer-scaffold": true
         }
     },
     "require-dev": {

src/Robo/Plugin/Traits/GitHubStatusTrait.php

@@ -134,7 +134,7 @@ protected function setGitHubStatus(
             'context' => $gitHubCheckName,
             'target_url' => $targetUrl ?? "$this->tugboatDashboardUrl/$tugboatPreviewID",
         ];
-        if (strlen($checkDescription) > 0) {
+        if ($checkDescription !== '') {
             $body['description'] = $checkDescription;
         }
         try {