Merge pull request #482 from UN-OCHA/deploy-20240917

Deploy 17-09-2024

.changelog

@@ -0,0 +1,11 @@
+<?php
+
+return [
+  'ignoreTypes' => ['build', 'ci', 'docs', 'refactor', 'revert', 'style', 'test'],
+  'tagPrefix' => 'v',
+  'tagSuffix' => '',
+  'commitUrlFormat' => '{{host}}/{{owner}}/{{repository}}/commit/{{hash}}',
+  'compareUrlFormat' => '{{host}}/{{owner}}/{{repository}}/compare/{{previousTag}}...{{currentTag}}',
+  'issueUrlFormat' => 'https://humanitarian.atlassian.net/browse/{{id}}',
+  'hiddenVersionSeparator' => true,
+];

.docksal/docksal.env

@@ -1,4 +1,4 @@
 DOCKSAL_STACK=default
 DOCROOT=html
 DB_IMAGE="docksal/db:1.1-mysql-5.7"
-CLI_IMAGE='docksal/cli:php8.0-build'
+CLI_IMAGE='docksal/cli:php8.2-build'

.github/workflows/composer-update.yml

@@ -13,8 +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_maintainers: ${{ vars.DRUPAL_MAINTAINERS }}
+        patch_branch: ${{ github.head_ref || github.ref_name }}
+        patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }}
         slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
         slack_channel_name: ${{ vars.SLACK_CHANNEL }}

.github/workflows/run-tests.yml

@@ -170,6 +170,14 @@ jobs:
           run: |
              docker compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show --count=50 --extended
 
+      - name: PHP Logs
+        id: phplog
+        if: failure()
+        uses: cafuego/command-output@main
+        with: 
+          run: |
+            docker compose -f tests/docker-compose.yml exec -T drupal grep -i fatal /var/log/php/error.log
+
       - name: Find Comment
         uses: peter-evans/find-comment@v3
         id: fc
@@ -197,16 +205,17 @@ jobs:
             #### PHP Code Sniffer \`${{ steps.phpcs.outcome }}\`
 
             <details><summary>Software Versions</summary>
-
-            \`\`\`${{ steps.versions.outputs.stdout }}\`\`\`
-
+            <code>${{ steps.versions.outputs.stdout }}</code>
             </details>
 
             <details><summary>Drupal Logs</summary>
+            <code>${{ steps.dblog.outputs.stdout }}</code>
+            </details>
 
-            \`\`\`${{ steps.dblog.outputs.stdout }}\`\`\`
-
+            <details><summary>PHP Logs</summary>
+            <code>${{ steps.phplog.outputs.stdout }}</code>
             </details>
+
             *Pusher: @${{ github.actor }}, Action: \`${{ github.event_name }}\`, Workflow: \`${{ github.workflow }}\`*`;
           edit-mode: replace