Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy 20-09-2023 #623

Merged
merged 32 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ab30f7f
chore: Prep update
attiks Aug 1, 2023
b06b492
Chore: add seven, rdf, ckeditor
attiks Aug 1, 2023
ad52763
chore: Admin css, markdown
attiks Aug 1, 2023
88c6ef8
chore: Add lenient and patch helper + update
attiks Aug 1, 2023
1c731f8
Chore: Add theme switcher
attiks Aug 1, 2023
1035cc9
Chore: Upgrade, themes
attiks Aug 1, 2023
74df7bf
Chore: Upgrade, themes
attiks Aug 1, 2023
3d28728
Chore: update dockerfile
attiks Aug 1, 2023
75a520f
Chore: update dockerfile
attiks Aug 1, 2023
5eaf0a8
Chore: Add stage file proxy
attiks Aug 1, 2023
5537a97
chore: Update all outdated drupal/* packages.
unocha-jenkins Aug 17, 2023
d3f96e3
Merge pull request #613 from UN-OCHA/update/patch-872a97e
lazysoundsystem Aug 17, 2023
1f94cfb
Merge remote-tracking branch 'origin/develop' into 20230801-D10
attiks Aug 21, 2023
2744188
chore: Merge and update
attiks Aug 21, 2023
7e89178
chore: Downgrade dynamic_entity_reference
attiks Aug 22, 2023
8bb3a97
Merge pull request #614 from UN-OCHA/feature/20230801-D10
attiks Aug 22, 2023
c1251f0
chore: update ckeditor version and config
lazysoundsystem Aug 22, 2023
121940e
Merge pull request #615 from UN-OCHA/OPS-9268-ckeditor5
lazysoundsystem Aug 23, 2023
36e0b31
chore: Update all outdated drupal/* packages.
unocha-jenkins Aug 24, 2023
cffdad1
Merge pull request #616 from UN-OCHA/update/patch-121940e
lazysoundsystem Aug 24, 2023
4ba3bc9
chore: bump aws action
lazysoundsystem Aug 30, 2023
b5a1ba5
Merge pull request #617 from UN-OCHA/OPS-9417-aws-sdk
cafuego Aug 30, 2023
7b9bf5a
chore: Update all outdated drupal/* packages.
unocha-jenkins Aug 31, 2023
92ca3cc
Merge pull request #618 from UN-OCHA/update/patch-b5a1ba5
lazysoundsystem Aug 31, 2023
6a8038a
chore: Update all outdated drupal/* packages.
unocha-jenkins Sep 7, 2023
3dcb30a
Merge pull request #619 from UN-OCHA/update/patch-92ca3cc
lazysoundsystem Sep 7, 2023
ff81dcb
chore: Update all outdated drupal/* packages.
unocha-jenkins Sep 14, 2023
e426297
Merge pull request #620 from UN-OCHA/update/patch-3dcb30a
lazysoundsystem Sep 14, 2023
9b456d7
chore: add standard local setup
lazysoundsystem Sep 14, 2023
8a24576
fix: Heading paras only output link on main content area of LP
rupl Sep 19, 2023
804a47e
Merge pull request #622 from UN-OCHA/RWR-367
rupl Sep 19, 2023
8aa6441
Merge pull request #621 from UN-OCHA/OPS-9227-local-setup
lazysoundsystem Sep 19, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Configure AWS Credentials
id: aws
if: ${{ !env.ACT }}
uses: aws-actions/configure-aws-credentials@v2
uses: aws-actions/configure-aws-credentials@v3
with:
aws-access-key-id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

# Ignore .env files as they are personal
/.env
/local/.env

# Ignore the build log.
/buildlog.txt
Expand Down
63 changes: 41 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,42 +31,45 @@
}
],
"require": {
"php": "8.*",
"composer/installers": "^1.9",
"cweagans/composer-patches": "^1.7",
"drupal/address": "^1.9",
"drupal/admin_denied": "^2.0",
"drupal/ckeditor": "^1.0",
"drupal/components": "^3.0@beta",
"drupal/config_split": "^2.0.0-rc4",
"drupal/content_lock": "^2.3",
"drupal/core-composer-scaffold": "^9",
"drupal/core-project-message": "^9",
"drupal/core-recommended": "^9",
"drupal/core-composer-scaffold": "^10",
"drupal/core-project-message": "^10",
"drupal/core-recommended": "^10",
"drupal/csp": "^1.16",
"drupal/csv_serialization": "^3.0@beta",
"drupal/dashboards": "^2.1",
"drupal/date_recur": "^3.2",
"drupal/environment_indicator": "^4.0",
"drupal/external_entities": "^2.0@alpha",
"drupal/field_group": "^3.2",
"drupal/flexible_permissions": "^1.0@beta",
"drupal/fullcalendar_api": "^2.0@alpha",
"drupal/geofield": "^1.36",
"drupal/google_tag": "^1.4",
"drupal/group": "^2.0.0-rc1",
"drupal/inline_entity_form": "^1.0@RC",
"drupal/jquery_ui_dialog": "^2.0",
"drupal/layout_paragraphs": "^2.0@beta",
"drupal/link_allowed_hosts": "^1.0@beta",
"drupal/linkchecker": "^1.0@beta",
"drupal/linkchecker": "^2.0@alpha",
"drupal/maintenance200": "^1.1",
"drupal/masquerade": "^2.0@beta",
"drupal/memcache": "^2.3",
"drupal/override_node_options": "^2.6",
"drupal/paragraphs_admin": "^1.4",
"drupal/paragraphs_asymmetric_translation_widgets": "^1.0@beta",
"drupal/pathauto": "^1.8",
"drupal/rdf": "^2.0",
"drupal/redirect": "^1.8",
"drupal/select2": "^1.13",
"drupal/seven": "^1.0@alpha",
"drupal/social_auth_hid": "^3.0",
"drupal/stage_file_proxy": "^2.1",
"drupal/subgroup": "^2.0.0-beta1",
"drupal/theme_switcher": "^1.2",
"drupal/twig_tweak": "^3.1",
Expand All @@ -78,15 +81,22 @@
"fullcalendar/fullcalendar": "^3.10.0",
"galbar/jsonpath": "^2.0",
"guzzlehttp/guzzle": "7.5.0 as 6.5.8",
"league/commonmark": "^2.4",
"league/commonmark": "1.6",
"mailchimp/marketing": "^3.0",
"mglaman/composer-drupal-lenient": "^1.0",
"npm-asset/moment": "^2.29",
"npm-asset/select2": "^4",
"oomphinc/composer-installers-extender": "^2.0",
"orakili/composer-drupal-info-file-patch-helper": "^1.0",
"rlanvin/php-rrule": "2.3.1",
"unocha/common_design": "^8",
"unocha/ocha_search": "^1.0"
},
"autoload": {
"classmap": [
"scripts/composer/DrupalLenientRequirement.php"
]
},
"conflict": {
"drupal/drupal": "*"
},
Expand All @@ -110,6 +120,9 @@
],
"post-update-cmd": [
"@git-hooks"
],
"pre-pool-create": [
"scripts\\composer\\DrupalLenientRequirement::changeVersionConstraint"
]
},
"minimum-stability": "stable",
Expand All @@ -126,10 +139,20 @@
"drupal/core-project-message": true,
"drupal/console-extend-plugin": true,
"symfony/flex": true,
"oomphinc/composer-installers-extender": true
"oomphinc/composer-installers-extender": true,
"orakili/composer-drupal-info-file-patch-helper": true,
"phpstan/extension-installer": true,
"mglaman/composer-drupal-lenient": true
}
},
"extra": {
"drupal-lenient": {
"constraint": "^10",
"allowed-list": [
"drupal/maintenance200",
"drupal/theme_switcher"
]
},
"enable-patching": true,
"composer-exit-on-patch-failure": true,
"patches-file": "composer.patches.json",
Expand Down Expand Up @@ -195,23 +218,19 @@
]
}
},
"version": "0.3.13",
"require-dev": {
"drupal/coder": "^8.3",
"drupal/config_filter": "^2.4",
"drupal/config_inspector": "^2.0",
"drupal/core-dev": "^9",
"drupal/dev_mode": "^2.3",
"drupal/devel_php": "^1.3",
"drupal/entity_type_clone": "^1.7",
"drupal/stage_file_proxy": "^2.0",
"drupal/upgrade_status": "^3.18",
"marcocesarato/php-conventional-changelog": "^1.13",
"drupal/config_inspector": "^2.1",
"drupal/core-dev": "^10.0",
"drupal/devel_php": "^1.5",
"marcocesarato/php-conventional-changelog": "^1.16",
"mglaman/drupal-check": "^1.4",
"phpcompatibility/php-compatibility": "^9.3",
"phpspec/prophecy-phpunit": "^2",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/php-code-coverage": "^9.2",
"phpunit/phpunit": "^9.5",
"weitzman/drupal-test-traits": "^1.5"
},
"version": "0.3.15"
"phpunit/phpunit": "^9.6",
"weitzman/drupal-test-traits": "^2.0"
}
}
Loading