Skip to content

Commit

Permalink
Merge pull request #223 from UN-OCHA/feature/deploy-20240117
Browse files Browse the repository at this point in the history
Prep deploy 20240117
  • Loading branch information
attiks authored Jan 16, 2024
2 parents d42c2b7 + cf42f56 commit 452d4d7
Show file tree
Hide file tree
Showing 15 changed files with 2,001 additions and 1,282 deletions.
1 change: 0 additions & 1 deletion .github/workflows/composer-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
uses: UN-OCHA/actions/composer-update@main
with:
github_access_token: ${{ secrets.PAT }}
php_version: '8.2'
patch_branch: 'develop'
patch_packages: 'drupal/*'
patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }}
Expand Down
12 changes: 0 additions & 12 deletions PATCHES/bcc-drupal-10-compatibility.patch

This file was deleted.

117 changes: 0 additions & 117 deletions PATCHES/layout_paragraphs-drupal-10-compatibility.patch

This file was deleted.

187 changes: 0 additions & 187 deletions PATCHES/maintenance200-drupal-10-compatibility.patch

This file was deleted.

11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"cweagans/composer-patches": "^1.7",
"drupal/admin_denied": "^2.0",
"drupal/allowed_formats": "^2.0",
"drupal/bcc": "^3.0@dev",
"drupal/bcc": "^4",
"drupal/classy": "^1.0",
"drupal/components": "^3.0@beta",
"drupal/config_split": "^2.0@rc",
Expand All @@ -40,7 +40,7 @@
"drupal/google_tag": "^1.6",
"drupal/imageapi_optimize_binaries": "^1.0@beta",
"drupal/layout_paragraphs": "^2.0",
"drupal/maintenance200": "^1.1",
"drupal/maintenance200": "^2",
"drupal/paragraphs": "^1.15",
"drupal/paragraphs_viewmode": "^1.1",
"drupal/pathauto": "^1.11",
Expand All @@ -50,7 +50,7 @@
"drupal/user_expire": "^1.1",
"drupal/username_enumeration_prevention": "^1.3",
"drupal/view_unpublished": "^1.1",
"drush/drush": "^11.3",
"drush/drush": "^12",
"orakili/composer-drupal-info-file-patch-helper": "^1",
"phpoffice/phpspreadsheet": "^1.27.1",
"unocha/common_design": "^8.0",
Expand All @@ -60,7 +60,7 @@
"drupal/coder": "^8.3",
"drupal/config_filter": "^2.2",
"drupal/devel": "^5.0",
"kint-php/kint": "^3.3",
"kint-php/kint": "^5",
"mikey179/vfsstream": "^1.6",
"phpcompatibility/php-compatibility": "^9.3",
"phpmd/phpmd": "^2.11",
Expand All @@ -84,7 +84,8 @@
"drupal/console-extend-plugin": true,
"orakili/composer-drupal-info-file-patch-helper": true,
"phpstan/extension-installer": true,
"symfony/flex": true
"symfony/flex": true,
"php-http/discovery": true
}
},
"autoload": {
Expand Down
Loading

0 comments on commit 452d4d7

Please sign in to comment.