Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
0e49357
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Apr 17, 2025
d8c5f04
Merge pull request #207 from UN-OCHA/update/patch-49346e0
lazysoundsystem Apr 22, 2025
ca6ceba
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Apr 24, 2025
90d3ffc
Merge pull request #208 from UN-OCHA/update/patch-d8c5f04
lazysoundsystem Apr 24, 2025
1bd5ca1
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins May 1, 2025
a74c353
Merge pull request #209 from UN-OCHA/update/patch-90d3ffc
lazysoundsystem May 1, 2025
a1a305a
chore: use standard update action with flag
lazysoundsystem May 6, 2025
533dd16
Merge pull request #210 from UN-OCHA/OPS-11381-scripts-flag-action
lazysoundsystem May 6, 2025
5843140
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins May 8, 2025
f97045c
Merge pull request #211 from UN-OCHA/update/patch-533dd16
cafuego May 9, 2025
4ad42a1
chore: update patch for deprecated function
lazysoundsystem May 14, 2025
ecf921a
Merge pull request #212 from UN-OCHA/RWR-505-imageapi_optimize_webp
lazysoundsystem May 14, 2025
14d5273
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins May 15, 2025
28bab8b
Merge pull request #213 from UN-OCHA/update/patch-ecf921a
lazysoundsystem May 20, 2025
5c3ee9d
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins May 22, 2025
0f1498a
Merge pull request #214 from UN-OCHA/update/patch-28bab8b
lazysoundsystem May 27, 2025
0a179a3
chore: Use the visible / editable maintainers var for PR assignment.
cafuego Jun 19, 2025
dda9166
Merge pull request #217 from UN-OCHA/cafuego/ops-11605-update-maintai…
cafuego Jun 20, 2025
7ea7282
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Jul 10, 2025
fe2d704
Merge pull request #218 from UN-OCHA/update/patch-dda9166
cafuego Jul 10, 2025
478356b
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Jul 17, 2025
ed3dcc3
Merge pull request #219 from UN-OCHA/update/patch-fe2d704
cafuego Jul 17, 2025
c65cb78
chore: Drop the patch that was committed upstream.
cafuego Aug 7, 2025
672652c
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Aug 14, 2025
f0fc35e
Merge pull request #220 from UN-OCHA/update/patch-c65cb78
cafuego Aug 15, 2025
e701ff0
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Aug 21, 2025
d3fdcc6
Merge pull request #222 from UN-OCHA/update/patch-f0fc35e
cafuego Aug 21, 2025
98dbfa1
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Sep 4, 2025
e1ae03c
Merge pull request #223 from UN-OCHA/update/patch-d3fdcc6
cafuego Sep 8, 2025
a8c04da
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Sep 11, 2025
5a36c7f
Merge pull request #224 from UN-OCHA/update/patch-e1ae03c
cafuego Sep 11, 2025
071e391
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Sep 18, 2025
3453143
Merge pull request #225 from UN-OCHA/update/patch-5a36c7f
cafuego Sep 18, 2025
4c2af17
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Sep 25, 2025
c9895ef
Merge pull request #227 from UN-OCHA/update/patch-3453143
cafuego Sep 29, 2025
6f1501a
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Oct 2, 2025
f18260d
Merge pull request #228 from UN-OCHA/update/patch-c9895ef
cafuego Oct 8, 2025
dc6522c
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Oct 9, 2025
2717454
Merge pull request #229 from UN-OCHA/update/patch-f18260d
cafuego Oct 9, 2025
63fda02
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Oct 16, 2025
cf2ac65
Merge pull request #230 from UN-OCHA/update/patch-2717454
cafuego Oct 16, 2025
7ce630d
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Oct 23, 2025
6371511
chore: Run earlier.
cafuego Oct 23, 2025
0dae92a
Merge pull request #232 from UN-OCHA/update/patch-cf2ac65
cafuego Oct 23, 2025
34e5a78
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Nov 6, 2025
93ec1f8
Merge pull request #233 from UN-OCHA/update/patch-0dae92a
cafuego Nov 6, 2025
94c4e7e
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Nov 20, 2025
f35e12f
Merge pull request #235 from UN-OCHA/update/patch-93ec1f8
cafuego Nov 23, 2025
015a9a8
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Nov 27, 2025
5fae79b
Merge pull request #237 from UN-OCHA/update/patch-f35e12f
cafuego Nov 27, 2025
13ef722
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Dec 4, 2025
931c858
Merge pull request #238 from UN-OCHA/update/patch-5fae79b
cafuego Dec 4, 2025
fc2ba7a
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Dec 11, 2025
82ea04a
Merge pull request #239 from UN-OCHA/update/patch-931c858
cafuego Dec 11, 2025
e839689
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Dec 18, 2025
f0e5825
Merge pull request #240 from UN-OCHA/update/patch-82ea04a
cafuego Dec 19, 2025
fb83ee1
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Jan 1, 2026
ee31135
Merge pull request #242 from UN-OCHA/update/patch-f0e5825
cafuego Jan 5, 2026
b72bae6
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Jan 8, 2026
18d4aa7
Merge pull request #244 from UN-OCHA/update/patch-ee31135
cafuego Jan 8, 2026
6d438d2
chore: update composer-patches to v2
orakili Jan 9, 2026
69383a9
Merge pull request #245 from UN-OCHA/feature/OPS-11869
cafuego Jan 12, 2026
1163df5
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Jan 15, 2026
39d95c5
Merge pull request #246 from UN-OCHA/update/patch-69383a9
cafuego Jan 15, 2026
3c6d73b
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Jan 22, 2026
118ff18
Merge pull request #247 from UN-OCHA/update/patch-39d95c5
orakili Jan 26, 2026
40ecb37
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Jan 29, 2026
0e3ffff
Merge pull request #251 from UN-OCHA/update/patch-118ff18
cafuego Jan 29, 2026
4e5ea4b
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Feb 5, 2026
b533afa
Merge pull request #253 from UN-OCHA/update/patch-0e3ffff
cafuego Feb 5, 2026
4bd159c
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Feb 12, 2026
2b89e60
Merge pull request #254 from UN-OCHA/update/patch-b533afa
cafuego Feb 12, 2026
6854aeb
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Feb 26, 2026
2cd92c0
Merge pull request #255 from UN-OCHA/update/patch-2b89e60
cafuego Feb 26, 2026
f200f1c
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Mar 5, 2026
b1d8061
Merge pull request #256 from UN-OCHA/update/patch-2cd92c0
cafuego Mar 9, 2026
b4f2634
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Mar 12, 2026
6a2c5a8
Merge pull request #257 from UN-OCHA/update/patch-b1d8061
cafuego Mar 12, 2026
2678de7
chore(tests): Bump PHP to 8.4.
cafuego Mar 23, 2026
bfd798d
chore(tests): Bump all github actions versions.
cafuego Mar 23, 2026
55f64ca
Merge pull request #259 from UN-OCHA/cafuego/ops-12036-bump-php
cafuego Mar 23, 2026
844a186
Merge branch 'develop' into cafuego/ops-12034-actionbump
cafuego Mar 23, 2026
ae744fe
Merge pull request #260 from UN-OCHA/cafuego/ops-12034-actionbump
cafuego Mar 23, 2026
7d9e6b8
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Mar 26, 2026
3f046a6
Merge pull request #261 from UN-OCHA/update/patch-ae744fe
cafuego Mar 26, 2026
d12d9a8
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Apr 2, 2026
b6e5186
Merge pull request #262 from UN-OCHA/update/patch-3f046a6
cafuego Apr 2, 2026
c419a0f
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Apr 8, 2026
adf9991
Merge pull request #263 from UN-OCHA/update/patch-b6e5186
orakili Apr 8, 2026
14fda2c
chore(deps-dev): bump form-data
dependabot[bot] Apr 8, 2026
fd0ede7
Merge pull request #221 from UN-OCHA/dependabot/npm_and_yarn/html/the…
orakili Apr 8, 2026
04ec748
chore(deps): bump tar-fs in /html/themes/custom/common_design_subtheme
dependabot[bot] Apr 8, 2026
13d0869
Merge pull request #226 from UN-OCHA/dependabot/npm_and_yarn/html/the…
orakili Apr 8, 2026
eb76576
chore(deps): bump js-yaml in /html/themes/custom/common_design_subtheme
dependabot[bot] Apr 8, 2026
6ed9111
Merge pull request #236 from UN-OCHA/dependabot/npm_and_yarn/html/the…
orakili Apr 8, 2026
60b115d
chore(deps): bump minimatch
dependabot[bot] Apr 8, 2026
5028dc9
Merge pull request #264 from UN-OCHA/dependabot/npm_and_yarn/html/the…
orakili Apr 8, 2026
969d0d8
chore(deps): bump flatted in /html/themes/custom/common_design_subtheme
dependabot[bot] Apr 8, 2026
bb50d98
Merge pull request #265 from UN-OCHA/dependabot/npm_and_yarn/html/the…
orakili Apr 8, 2026
7aaf909
chore(deps-dev): bump @xmldom/xmldom
dependabot[bot] Apr 8, 2026
331fc8d
Merge pull request #266 from UN-OCHA/dependabot/npm_and_yarn/html/the…
orakili Apr 8, 2026
dcdb2c3
chore(deps): bump basic-ftp
dependabot[bot] Apr 8, 2026
1dda22c
Merge pull request #267 from UN-OCHA/dependabot/npm_and_yarn/html/the…
orakili Apr 8, 2026
a7df144
chore(deps-dev): bump svgo in /html/themes/custom/common_design_subtheme
dependabot[bot] Apr 8, 2026
744dc54
Merge pull request #268 from UN-OCHA/dependabot/npm_and_yarn/html/the…
orakili Apr 8, 2026
cefa020
chore(deps-dev): bump picomatch
dependabot[bot] Apr 8, 2026
9623882
Merge pull request #269 from UN-OCHA/dependabot/npm_and_yarn/html/the…
orakili Apr 8, 2026
5b9fdba
chore(deps-dev): bump lodash
dependabot[bot] Apr 8, 2026
383c95b
Merge pull request #270 from UN-OCHA/dependabot/npm_and_yarn/html/the…
orakili Apr 8, 2026
6e9e385
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Apr 9, 2026
2b33bdf
Merge pull request #272 from UN-OCHA/update/patch-383c95b
cafuego Apr 9, 2026
c0d30a4
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Apr 16, 2026
00d77ee
Merge pull request #277 from UN-OCHA/update/patch-2b33bdf
cafuego Apr 20, 2026
1618db5
chore: Use the latest mysql:11 docker image for tests.
cafuego Apr 22, 2026
baae989
Merge pull request #279 from UN-OCHA/cafuego/ops-12081-bump-mariadb
cafuego Apr 22, 2026
b40048d
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Apr 23, 2026
e3835eb
Merge pull request #280 from UN-OCHA/update/patch-baae989
cafuego Apr 23, 2026
df6613b
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins Apr 30, 2026
e13b768
Merge pull request #283 from UN-OCHA/update/patch-e3835eb
cafuego Apr 30, 2026
95cc395
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins May 7, 2026
21a6cd5
Merge pull request #286 from UN-OCHA/update/patch-e13b768
cafuego May 7, 2026
f80682a
chore: Update all outdated drupal/* unocha/* drush/* weitzman/drupal-…
unocha-jenkins May 14, 2026
275d3d8
Merge pull request #289 from UN-OCHA/update/patch-21a6cd5
cafuego May 14, 2026
c59a54a
Merge branch 'main' into develop
cafuego May 15, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
!composer.json
!composer.lock
!composer.patches.json
!patches.lock.json
!symfony.lock
!load.environment.php

Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-sp
# Define binary file attributes.
# - Do not treat them as text.
# - Include binary diff in patches instead of "binary files differ."
*.avif -text diff
*.eot -text diff
*.exe -text diff
*.gif -text diff
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/composer-update-scripts.yml

This file was deleted.

5 changes: 4 additions & 1 deletion .github/workflows/composer-update.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Run Composer Update

on:
schedule:
- cron: '11 1 * * 4'
workflow_dispatch:

jobs:
Expand All @@ -13,8 +15,9 @@ jobs:
with:
aws_access_key_id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
aws_secret_access_key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
composer_scripts: "true"
github_access_token: ${{ secrets.PAT }}
patch_branch: ${{ github.head_ref || github.ref_name }}
patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }}
patch_maintainers: ${{ vars.DRUPAL_MAINTAINERS }}
slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
slack_channel_name: ${{ vars.SLACK_CHANNEL }}
26 changes: 13 additions & 13 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- name: Checkout Code
id: checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Extract PHP Version
id: php
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Configure AWS Credentials
id: aws
if: ${{ !env.ACT }}
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@v5
with:
aws-access-key-id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
Expand All @@ -81,7 +81,7 @@ jobs:
- name: Login to Public ECR
id: aws-login
if: ${{ !env.ACT }}
uses: docker/login-action@v3.0.0
uses: docker/login-action@v4
with:
registry: public.ecr.aws
username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
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
uses: peter-evans/find-comment@v4
if: ${{ !env.ACT }}
id: fc
with:
Expand All @@ -193,7 +193,7 @@ jobs:
body-includes: Build output

- name: Create or update comment
uses: peter-evans/create-or-update-comment@v4
uses: peter-evans/create-or-update-comment@v5
if: ${{ !env.ACT }}
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -224,11 +224,13 @@ jobs:
- name: Slack Success Notification
id: slack_success
if: ${{ !env.ACT && success() }}
uses: slackapi/slack-github-action@v1.25.0
uses: slackapi/slack-github-action@v3
with:
channel-id: '${{ vars.SLACK_CHANNEL }}'
method: chat.postMessage
token: ${{ secrets.SLACK_BOT_TOKEN }}
payload: |
{
"channel": "${{ vars.SLACK_CHANNEL }}",
"text": "Tests passed for a pull request on ${{ github.repository }}",
"attachments": [
{
Expand All @@ -245,17 +247,17 @@ jobs:
}
]
}
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

- name: Slack Failure Notification
id: slack_failure
if: ${{ !env.ACT && failure() }}
uses: slackapi/slack-github-action@v1.25.0
uses: slackapi/slack-github-action@v3
with:
channel-id: '${{ vars.SLACK_CHANNEL }}'
method: chat.postMessage
token: ${{ secrets.SLACK_BOT_TOKEN }}
payload: |
{
"channel": "${{ vars.SLACK_CHANNEL }}",
"text": "Tests failed for a pull request on ${{ github.repository }}",
"attachments": [
{
Expand All @@ -272,8 +274,6 @@ jobs:
}
]
}
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

- name: Clean up
id: docker-clean-up
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# Variables. Yes.
DOCKER=docker
DOCKER_BUILDKIT=0
IMAGE_NAME=starterkit-site
IMAGE_TAG=local

# The main build recipe.
build: clean
DOCKER_BUILDKIT=$(DOCKER_BUILDKIT) $(DOCKER) build \
$(DOCKER) buildx build \
--build-arg BRANCH_ENVIRONMENT=$(NODE_ENV) \
--build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url | sed 's#git@github.com:#https://github.com/#'` \
Expand Down
2 changes: 1 addition & 1 deletion PATCHES/imageapi_optimize_webp-imagemagick-toolkit.patch
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ index 070c6fe..20d8bd5 100644
+ $source_image->save($destination);
+ }
+ elseif ($toolkit_id == 'gd') {
+ imagewebp($source_image->getToolkit()->getResource(), $destination, $this->configuration['quality']);
+ imagewebp($source_image->getToolkit()->getImage(), $destination, $this->configuration['quality']);
+ }
+ else {
+ return FALSE;
Expand Down
179 changes: 0 additions & 179 deletions PATCHES/user_expire-customize-notification-email.patch

This file was deleted.

Loading
Loading