From 74100ec9816ddbb6b1118edc10f16a3657d5a038 Mon Sep 17 00:00:00 2001 From: unocha-jenkins Date: Thu, 9 May 2024 07:39:42 +0000 Subject: [PATCH 1/6] chore: Update all outdated drupal/* packages. --- composer.lock | 77 ++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/composer.lock b/composer.lock index 69740629..80187ff7 100644 --- a/composer.lock +++ b/composer.lock @@ -617,16 +617,16 @@ }, { "name": "composer/composer", - "version": "2.7.4", + "version": "2.7.6", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "a625e50598e12171d3f60b1149eb530690c43474" + "reference": "fabd995783b633829fd4280e272284b39b6ae702" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/a625e50598e12171d3f60b1149eb530690c43474", - "reference": "a625e50598e12171d3f60b1149eb530690c43474", + "url": "https://api.github.com/repos/composer/composer/zipball/fabd995783b633829fd4280e272284b39b6ae702", + "reference": "fabd995783b633829fd4280e272284b39b6ae702", "shasum": "" }, "require": { @@ -711,7 +711,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.7.4" + "source": "https://github.com/composer/composer/tree/2.7.6" }, "funding": [ { @@ -727,7 +727,7 @@ "type": "tidelift" } ], - "time": "2024-04-22T19:17:03+00:00" + "time": "2024-05-04T21:03:15+00:00" }, { "name": "composer/installers", @@ -1183,16 +1183,16 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.4", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255" + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255", - "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", "shasum": "" }, "require": { @@ -1229,7 +1229,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.4" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" }, "funding": [ { @@ -1245,7 +1245,7 @@ "type": "tidelift" } ], - "time": "2024-03-26T18:29:49+00:00" + "time": "2024-05-06T16:37:16+00:00" }, { "name": "consolidation/annotated-command", @@ -3370,27 +3370,27 @@ }, { "name": "drupal/csp", - "version": "1.30.0", + "version": "1.31.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/csp.git", - "reference": "8.x-1.30" + "reference": "8.x-1.31" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/csp-8.x-1.30.zip", - "reference": "8.x-1.30", - "shasum": "50ff811459e9d93a1d605f96ada4082aa0dc637f" + "url": "https://ftp.drupal.org/files/projects/csp-8.x-1.31.zip", + "reference": "8.x-1.31", + "shasum": "f5279b78f2edac89d5cb2a731a246da9d429573a" }, "require": { - "drupal/core": "~10.0.0 || ^10.1.3", + "drupal/core": "~10.0.0 || ^10.1.3 || ^11", "ext-json": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.30", - "datestamp": "1705655685", + "version": "8.x-1.31", + "datestamp": "1714819870", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9939,16 +9939,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.28.0", + "version": "1.29.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb" + "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", - "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc", + "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc", "shasum": "" }, "require": { @@ -9980,9 +9980,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0" }, - "time": "2024-04-03T18:51:33+00:00" + "time": "2024-05-06T12:04:23+00:00" }, { "name": "phpstan/phpstan", @@ -16147,30 +16147,31 @@ }, { "name": "webflo/drupal-finder", - "version": "1.2.2", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/webflo/drupal-finder.git", - "reference": "c8e5dbe65caef285fec8057a4c718a0d4138d1ee" + "reference": "1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webflo/drupal-finder/zipball/c8e5dbe65caef285fec8057a4c718a0d4138d1ee", - "reference": "c8e5dbe65caef285fec8057a4c718a0d4138d1ee", + "url": "https://api.github.com/repos/webflo/drupal-finder/zipball/1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a", + "reference": "1fa65484857c7a2e4dcf0d9e0b47198fe0681b8a", "shasum": "" }, "require": { - "ext-json": "*" + "composer-runtime-api": "^2.2", + "php": ">=8.1" }, "require-dev": { "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^10.4" }, "type": "library", "autoload": { - "classmap": [ - "src/DrupalFinder.php" - ] + "psr-4": { + "DrupalFinder\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -16182,12 +16183,12 @@ "email": "florian@webflo.org" } ], - "description": "Helper class to locate a Drupal installation from a given path.", + "description": "Helper class to locate a Drupal installation.", "support": { "issues": "https://github.com/webflo/drupal-finder/issues", - "source": "https://github.com/webflo/drupal-finder/tree/1.2.2" + "source": "https://github.com/webflo/drupal-finder/tree/1.3.0" }, - "time": "2020-10-27T09:42:17+00:00" + "time": "2024-05-08T21:22:39+00:00" }, { "name": "webmozart/assert", From d2d6407528d4416e46cd38f111d550b102fcb377 Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Tue, 14 May 2024 10:24:38 +1000 Subject: [PATCH 2/6] chore: Update composer-update workflow so it has credentials. --- .github/workflows/composer-update.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composer-update.yml b/.github/workflows/composer-update.yml index c7e3d887..4ec19a55 100644 --- a/.github/workflows/composer-update.yml +++ b/.github/workflows/composer-update.yml @@ -13,9 +13,10 @@ jobs: id: update-action uses: UN-OCHA/actions/composer-update@main with: + aws_access_key_id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }} + aws_secret_access_key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }} github_access_token: ${{ secrets.PAT }} - patch_branch: 'develop' - patch_packages: 'drupal/*' + patch_branch: ${{ github.head_ref || github.ref_name }} patch_maintainers: ${{ vars.DRUPAL_MAINTAINERS }} slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }} slack_channel_name: ${{ vars.SLACK_CHANNEL }} From a1bcaf7a21294a7c61fcab8d17681cbf335e468a Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Tue, 14 May 2024 10:25:03 +1000 Subject: [PATCH 3/6] chore: Update run-tests workflow so it sues node20 actions. --- .github/workflows/run-tests.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 98401076..57ffecae 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -5,11 +5,17 @@ on: [pull_request] jobs: tests: runs-on: ubuntu-latest + permissions: + contents: write + checks: write + pull-requests: write + actions: read + statuses: write steps: - name: Checkout Code id: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Extract PHP Version id: php @@ -97,6 +103,7 @@ jobs: with: run: | docker-compose -f .github/tests/docker-compose.yml exec -w /srv/www -T drupal /usr/bin/composer run sub-theme + - name: PHPCS id: phpcs uses: cafuego/command-output@main @@ -157,7 +164,7 @@ jobs: docker-compose -f .github/tests/docker-compose.yml exec -T drupal drush watchdog:show - name: Find Comment - uses: peter-evans/find-comment@v2 + uses: peter-evans/find-comment@v3 id: fc with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -166,7 +173,7 @@ jobs: body-includes: Build output - name: Create or update comment - uses: peter-evans/create-or-update-comment@v2 + uses: peter-evans/create-or-update-comment@v4 with: github-token: ${{ secrets.GITHUB_TOKEN }} comment-id: ${{ steps.fc.outputs.comment-id }} @@ -193,7 +200,7 @@ jobs: - name: Slack Success Notification id: slack_success if: success() - uses: slackapi/slack-github-action@v1.23.0 + uses: slackapi/slack-github-action@v1.25.0 with: channel-id: '${{ vars.SLACK_CHANNEL }}' payload: | @@ -220,7 +227,7 @@ jobs: - name: Slack Failure Notification id: slack_failure if: failure() - uses: slackapi/slack-github-action@v1.23.0 + uses: slackapi/slack-github-action@v1.25.0 with: channel-id: '${{ vars.SLACK_CHANNEL }}' payload: | From 273aa7f1133fae4d45f2b55db40e8e7f92dedcc2 Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Tue, 14 May 2024 10:25:32 +1000 Subject: [PATCH 4/6] chore: Update mariadb to be the version we actually use. --- .github/tests/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/tests/docker-compose.yml b/.github/tests/docker-compose.yml index f5c47c75..0963c549 100644 --- a/.github/tests/docker-compose.yml +++ b/.github/tests/docker-compose.yml @@ -22,7 +22,7 @@ services: - default mysql: - image: public.ecr.aws/unocha/mysql:10.6 + image: public.ecr.aws/unocha/mysql:10.11 hostname: hpc-content-test-mysql container_name: hpc-content-test-mysql environment: @@ -92,4 +92,4 @@ services: ports: - "7900:7900" networks: - - default \ No newline at end of file + - default From 54f2bc2dafe9fb91c8acd680e32028e8d9ecc9ac Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Tue, 14 May 2024 10:30:33 +1000 Subject: [PATCH 5/6] fix: Bump drush, as 12.5.1 seems to be horrifically broken and just silently exits. Refs: OPS-10388 --- composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 80187ff7..bdefa7d0 100644 --- a/composer.lock +++ b/composer.lock @@ -2533,7 +2533,7 @@ "reference": "6ddc8cbd576206887b648d1195638effe990896a" }, "require": { - "drupal/core": "^8 || ^9 || ^10 || ^11" + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { @@ -4813,7 +4813,7 @@ "shasum": "b01ed2dd4371c9ff24dbbbe235bedfe44f0e008e" }, "require": { - "drupal/core": "^8 || ^9 || ^10 || ^11" + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { @@ -6290,16 +6290,16 @@ }, { "name": "drush/drush", - "version": "12.5.1", + "version": "12.5.2", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "71fcea30a22e7336e17be18bb5945400b2c63fad" + "reference": "4aebed85dc818ff762f2e24a85b023d2a52050df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/71fcea30a22e7336e17be18bb5945400b2c63fad", - "reference": "71fcea30a22e7336e17be18bb5945400b2c63fad", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/4aebed85dc818ff762f2e24a85b023d2a52050df", + "reference": "4aebed85dc818ff762f2e24a85b023d2a52050df", "shasum": "" }, "require": { @@ -6422,7 +6422,7 @@ "issues": "https://github.com/drush-ops/drush/issues", "security": "https://github.com/drush-ops/drush/security/advisories", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/12.5.1" + "source": "https://github.com/drush-ops/drush/tree/12.5.2" }, "funding": [ { @@ -6430,7 +6430,7 @@ "type": "github" } ], - "time": "2024-03-20T15:03:27+00:00" + "time": "2024-05-02T17:20:48+00:00" }, { "name": "egulias/email-validator", From a4017ca4c4d6a61b33ab738ec3051d4fd2ac2160 Mon Sep 17 00:00:00 2001 From: Peter Lieverdink Date: Tue, 14 May 2024 10:56:46 +1000 Subject: [PATCH 6/6] fix: The peter-evans actions want a token now, not github-token. --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 57ffecae..e75dc0f0 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -167,7 +167,7 @@ jobs: uses: peter-evans/find-comment@v3 id: fc with: - github-token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} issue-number: ${{ github.event.pull_request.number }} comment-author: 'github-actions[bot]' body-includes: Build output @@ -175,7 +175,7 @@ jobs: - name: Create or update comment uses: peter-evans/create-or-update-comment@v4 with: - github-token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} comment-id: ${{ steps.fc.outputs.comment-id }} issue-number: ${{ github.event.pull_request.number }} body: |