WCMS-11617 Allow CI build to reflect composer changes (#3847)

GetDKAN · Oct 10, 2022 · f8e4ee4 · f8e4ee4
1 parent 1b43d2b
commit f8e4ee4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -67,9 +67,11 @@ commands:
                 name: Install site and update to dev dkan
                 command: |
                   ddev composer show getdkan/dkan
+                  # Install dkan release specified by getdkan/recommended-project.
                   ddev dkan-site-install
+                  # Switch over to using the repo code for dkan and update.
                   ddev composer config repositories.dkan path dkan
-                  ddev composer require getdkan/dkan:@dev --no-install
+                  ddev composer require getdkan/dkan:@dev --no-install -W
                   ddev composer update getdkan/dkan -W
                   ddev composer show getdkan/dkan
                   ddev drush updb -y
@@ -81,7 +83,8 @@ commands:
                 name: Install site
                 command: |
                   ddev composer config repositories.dkan path dkan
-                  ddev composer require getdkan/dkan:@dev
+                  ddev composer require getdkan/dkan:@dev --no-install -W
+                  ddev composer update getdkan/dkan -W
                   ddev composer show getdkan/dkan
                   ddev dkan-site-install
                   ddev drush updb -y

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "minimum-stability": "dev",
     "description": "DKAN Open Data Catalog",
     "require": {
-        "drupal/admin_toolbar": "^2.3",
+        "drupal/admin_toolbar": "^3",
         "drupal/config_update": "^1.6",
         "drupal/indexer": "1.0.x-dev",
         "drupal/moderated_content_bulk_publish": "^2.0",