Skip to content

Commit

Permalink
Update to select_or_other 4.x (#3792)
Browse files Browse the repository at this point in the history
  • Loading branch information
paul-m committed Jul 8, 2022
1 parent b1eb22a commit fb58a9e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ commands:
command: |
git --git-dir=dkan/.git --work-tree=dkan checkout "${CIRCLE_SHA1}"
dktl exec:composer -- require --no-interaction --ansi --no-update "getdkan/dkan:dev-${CIRCLE_SHA1}"
rm -rf docroot/modules/contrib/select_or_other
rm -rf vendor/
dktl exec:composer -- update --no-interaction --ansi
dktl drush cache:rebuild
dktl drush updatedb -y
Expand Down
17 changes: 9 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
"minimum-stability": "dev",
"description": "DKAN Open Data Catalog",
"require": {
"cweagans/composer-patches": "^1.7",
"drupal/admin_toolbar": "^2.3",
"drupal/config_update": "^1.6",
"drupal/indexer": "1.0.x-dev",
"drupal/moderated_content_bulk_publish": "^2.0",
"drupal/search_api": "^1.15",
"drupal/select_or_other": "1.x-dev",
"drupal/select_or_other": "dev-4.x#ae0585ff8c",
"drupal/select2": "1.x-dev",
"drupal/views_bulk_operations": "^4.0",
"ext-json": "*",
Expand Down Expand Up @@ -63,12 +62,14 @@
"installer-types": [
"bower-asset",
"npm-asset"
],
"enable-patching": true,
"patches": {
"drupal/select_or_other": {
"https://www.drupal.org/project/select_or_other/issues/3205010": "https://git.drupalcode.org/project/select_or_other/-/merge_requests/1/diffs.patch"
}
]
},
"discard-changes": true,
"config": {
"allow-plugins": {
"composer/installers": true,
"cweagans/composer-patches": true,
"oomphinc/composer-installers-extender": true
}
}
}

0 comments on commit fb58a9e

Please sign in to comment.