diff --git a/.changelog b/.changelog
new file mode 100644
index 00000000..d99a566c
--- /dev/null
+++ b/.changelog
@@ -0,0 +1,11 @@
+ ['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,
+];
diff --git a/.github/workflows/composer-update.yml b/.github/workflows/composer-update.yml
index d17d494b..e4e42fe1 100644
--- a/.github/workflows/composer-update.yml
+++ b/.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_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 }}
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 3d40551f..be276ebd 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -230,6 +230,14 @@ jobs:
run: |
docker compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show
+ - 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
if: ${{ !env.ACT }}
@@ -259,10 +267,15 @@ jobs:
Software Versions
${{ steps.versions.outputs.stdout }}
Drupal Logs
${{ steps.dblog.outputs.stdout }}
PHP Logs
+ ${{ steps.phplog.outputs.stdout }}
+
+
+
diff --git a/html/themes/custom/common_design_subtheme/components/uno-section-tabs/uno-section-tabs.js b/html/themes/custom/common_design_subtheme/components/uno-section-tabs/uno-section-tabs.js
index 7d040a38..affb64f2 100644
--- a/html/themes/custom/common_design_subtheme/components/uno-section-tabs/uno-section-tabs.js
+++ b/html/themes/custom/common_design_subtheme/components/uno-section-tabs/uno-section-tabs.js
@@ -89,9 +89,12 @@
});
// Initially activate the first tab and reveal the first tab panel.
- tabs[0].removeAttribute('tabindex');
- tabs[0].setAttribute('aria-selected', 'true');
- panels[0].hidden = false;
+ for (var tab of tabs) {
+ tab.removeAttribute('tabIndex');
+ tab.setAttribute('aria-selected', 'true');
+ panels[0].hidden = false;
+ break;
+ }
};
// Enhance tabbed sections.
diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index 9d0d9166..f093acea 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -3400,12 +3400,12 @@
"dev": true
},
"node_modules/axios": {
- "version": "1.6.7",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
- "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+ "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
"dev": true,
"dependencies": {
- "follow-redirects": "^1.15.4",
+ "follow-redirects": "^1.15.6",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
@@ -14755,12 +14755,12 @@
"dev": true
},
"axios": {
- "version": "1.6.7",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
- "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+ "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
"dev": true,
"requires": {
- "follow-redirects": "^1.15.4",
+ "follow-redirects": "^1.15.6",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 94ae3c68..c0e1d418 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -1,12 +1,12 @@
-version: "2.2"
+name: unocha-test
networks:
default:
volumes:
- unocha-test-site-database:
- unocha-test-site-public:
- unocha-test-site-private:
+ site-database:
+ site-public:
+ site-private:
services:
memcache:
@@ -29,7 +29,7 @@ services:
- MYSQL_USER=unocha
- MYSQL_PASS=unocha
volumes:
- - "unocha-test-site-database:/var/lib/mysql:rw"
+ - "site-database:/var/lib/mysql:rw"
networks:
- default
@@ -45,8 +45,8 @@ services:
# Mount config.
- "../config:/srv/www/config:rw"
# Mount volumes for the private and public files.
- - "unocha-test-site-public:/srv/www/html/sites/default/files:rw"
- - "unocha-test-site-private:/srv/www/html/sites/default/private:rw"
+ - "site-public:/srv/www/html/sites/default/files:rw"
+ - "site-private:/srv/www/html/sites/default/private:rw"
# Mount the folders needed for the tests.
- "../phpcs.xml:/srv/www/phpcs.xml:ro"
- "../phpunit.xml:/srv/www/phpunit.xml:ro"