Merge pull request #994 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

@@ -12,7 +12,7 @@ DOCKSAL_STACK=default
 # This will prevent images from being updated when Docksal is updated
 #WEB_IMAGE='docksal/web:x.x-apache2.4'
 #DB_IMAGE='docksal/db:x.x-mysql-5.6'
-CLI_IMAGE='docksal/cli:php8.2-build'
+CLI_IMAGE='docksal/cli:php8.3-build'
 
 # Override virtual host (matches project folder name by default)
 #VIRTUAL_HOST=iasc8.local.docksal

.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: ${{ github.ref_name }}
+        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

@@ -167,6 +167,14 @@ jobs:
           threshold_metric: "lines"
           comment_footer: false
 
+      - 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: DB Logs
         id: dblog
         if: failure()
@@ -204,10 +212,15 @@ jobs:
             <details><summary>Software Versions</summary>
             <code>${{ steps.versions.outputs.stdout }}</code>
             </details>
+
             <details><summary>Drupal Logs</summary>
             <code>${{ steps.dblog.outputs.stdout }}</code>
             </details>
 
+            <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