From 1251c5a54e9ff82fb7bf7eecc0d1387e4aa46cf2 Mon Sep 17 00:00:00 2001 From: Andy Footner Date: Mon, 8 Apr 2024 12:55:30 +0200 Subject: [PATCH] tests: adjust for consistency Refs: updates --- .github/workflows/composer-update.yml | 3 +- .github/workflows/run-tests.yml | 29 +++++++- composer.json | 1 + composer.lock | 103 +++++++++++++++++++++++++- 4 files changed, 127 insertions(+), 9 deletions(-) diff --git a/.github/workflows/composer-update.yml b/.github/workflows/composer-update.yml index 72d815a..4fa5cd9 100644 --- a/.github/workflows/composer-update.yml +++ b/.github/workflows/composer-update.yml @@ -18,5 +18,4 @@ jobs: patch_packages: 'drupal/*' patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }} slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }} - slack_channel_name: ${{ secrets.SLACK_CHANNEL }} - flowdock_token: ${{ secrets.FLOWDOCK_TOKEN }} + slack_channel_name: ${{ vars.SLACK_CHANNEL }} diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 6db2284..9cf6ad5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -197,7 +197,7 @@ jobs: comment-id: ${{ steps.fc.outputs.comment-id }} issue-number: ${{ github.event.pull_request.number }} body: | - ### Build output + ### Test run output #### Composer Validate `${{ steps.validate.outcome }}` #### PHP Lint `${{ steps.lint.outcome }}` #### Docker Build `${{ steps.build.outcome }}` @@ -208,6 +208,27 @@ jobs:
Software Versions ${{ steps.versions.outputs.stdout }}
+ +
Composer Validate + ${{ steps.validate.outputs.stdout }} + ${{ steps.validate.outputs.stderr }} +
+ +
PHP Lint + ${{ steps.lint.outputs.stdout }} + ${{ steps.lint.outputs.stderr }} +
+ +
PHPCS + ${{ steps.phpcs.outputs.stdout }} + ${{ steps.phpcs.outputs.stderr }} +
+ +
Tests + ${{ steps.tests.outputs.stdout }} + ${{ steps.tests.outputs.stderr }} +
+
Drupal Logs ${{ steps.dblog.outputs.stdout }}
@@ -220,7 +241,7 @@ jobs: if: ${{ !env.ACT && success() }} uses: slackapi/slack-github-action@v1.25.0 with: - channel-id: '${{ secrets.SLACK_CHANNEL }}' + channel-id: '${{ vars.SLACK_CHANNEL }}' payload: | { "text": "Tests passed for a pull request on ${{ github.repository }}", @@ -247,7 +268,7 @@ jobs: if: ${{ !env.ACT && failure() }} uses: slackapi/slack-github-action@v1.25.0 with: - channel-id: '${{ secrets.SLACK_CHANNEL }}' + channel-id: '${{ vars.SLACK_CHANNEL }}' payload: | { "text": "Tests failed for a pull request on ${{ github.repository }}", @@ -275,6 +296,6 @@ jobs: uses: cafuego/command-output@main with: run: | - docker compose -f tests/docker-compose.yml down + docker compose -f tests/docker-compose.yml down --rmi local -v env: fail-fast: true diff --git a/composer.json b/composer.json index f309a98..808320e 100644 --- a/composer.json +++ b/composer.json @@ -63,6 +63,7 @@ "drupal/coder": "^8.3", "drupal/config_filter": "^2.2", "drupal/devel": "^5.0", + "drupal/stage_file_proxy": "^2.1", "kint-php/kint": "^5", "mikey179/vfsstream": "^1.6", "phpcompatibility/php-compatibility": "^9.3", diff --git a/composer.lock b/composer.lock index 2803dc0..85878ff 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "85b35b08568c6a8335395f842a54d7ec", + "content-hash": "69822e38d04248e33c4ae4f909b553d4", "packages": [ { "name": "asm89/stack-cors", @@ -2565,7 +2565,7 @@ "shasum": "5cda4ba5f9f5ed0a94914dc4a9bd501208ae553f" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^10" }, "type": "drupal-module", "extra": { @@ -3863,7 +3863,7 @@ "shasum": "fc8ea60619b6b4682bade340e13fb4565d3a7e0c" }, "require": { - "drupal/core": "^9.1 || ^10" + "drupal/core": "^10" }, "type": "drupal-module", "extra": { @@ -14720,6 +14720,103 @@ "slack": "https://drupal.slack.com/archives/C012WAW1MH6" } }, + { + "name": "drupal/stage_file_proxy", + "version": "2.1.4", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/stage_file_proxy.git", + "reference": "2.1.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.1.4.zip", + "reference": "2.1.4", + "shasum": "85f8451f123fcfb1b272f5a0cc11e6bd1673476c" + }, + "require": { + "drupal/core": "^9 || ^10", + "php": ">=8" + }, + "require-dev": { + "drupal/coder": "^8.3", + "drush/drush": "^11 || ^12" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.1.4", + "datestamp": "1706627704", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + }, + "drush": { + "services": { + "stage_file_proxy.drush.services.yml": "^11" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "scripts": { + "phpcs": [ + "vendor/bin/phpcs -p ." + ], + "phpcbf": [ + "vendor/bin/phpcbf -p ." + ], + "test": [ + "@phpcs" + ] + }, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "BarisW", + "homepage": "https://www.drupal.org/user/107229" + }, + { + "name": "geek-merlin", + "homepage": "https://www.drupal.org/user/229048" + }, + { + "name": "greggles", + "homepage": "https://www.drupal.org/user/36762" + }, + { + "name": "markdorison", + "homepage": "https://www.drupal.org/user/346106" + }, + { + "name": "moshe weitzman", + "homepage": "https://www.drupal.org/user/23" + }, + { + "name": "msonnabaum", + "homepage": "https://www.drupal.org/user/75278" + }, + { + "name": "netaustin", + "homepage": "https://www.drupal.org/user/199298" + }, + { + "name": "robwilmshurst", + "homepage": "https://www.drupal.org/user/144488" + }, + { + "name": "smustgrave", + "homepage": "https://www.drupal.org/user/3252890" + } + ], + "description": "Provides stage_file_proxy module.", + "homepage": "https://www.drupal.org/project/stage_file_proxy", + "support": { + "source": "https://git.drupalcode.org/project/stage_file_proxy" + } + }, { "name": "kint-php/kint", "version": "5.1.0",