diff --git a/.circleci/config.yml b/.circleci/config.yml index 3989883b9..deaf9a87c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: command: | export PATH=$PATH:~/dkan-tools/bin cd ~/sandbox - dktl get 8.7.4 + dktl get 8.7.5 - run: name: Make DKAN command: | @@ -43,7 +43,7 @@ jobs: sudo echo "{\"description\":\"Project\",\"minimum-stability\":\"dev\",\"repositories\":[{\"type\":\"vcs\",\"url\":\"https://github.com/$CIRCLE_PR_USERNAME/dkan2\"},{\"type\":\"vcs\",\"url\":\"https://github.com/fmizzell/json_form\"},{\"type\":\"vcs\",\"url\":\"https://github.com/civicactions/lunr.php\"},{\"type\":\"composer\",\"url\":\"https://asset-packagist.org\"}],\"require\":{\"getdkan/dkan2\":\"dev-$CIRCLE_PR_BRANCH\"}}" > src/make/composer.json fi' cat src/make/composer.json - dktl make --frontend + dktl make dktl updatedrush -y rm -rf ./docroot/profiles/contrib/dkan2 mv ~/project ./docroot/profiles/contrib/dkan2 diff --git a/composer.json b/composer.json index a873f90ff..721a8e7d7 100644 --- a/composer.json +++ b/composer.json @@ -10,13 +10,13 @@ "cweagans/composer-patches": "^1.5.0", "drupal/config_update": "1.x-dev", "drupal/entity": "1.0.0-rc1", - "fmizzell/datastore" : ">=0.0.2", - "fmizzell/harvest": ">=0.1.4", "fmizzell/json_form": "dev-8.x-1.x", - "fmizzell/json-schema-provider": ">=0.0.2", - "fmizzell/sae" : ">=1.0.1", - "fmizzell/sql-parser": ">=1.0.1", - "getdkan/lunr.php": ">=1.0.0", + "getdkan/datastore" : "~0.0.2", + "getdkan/harvest": "~0.1.4", + "getdkan/json-schema-provider": "~0.0.2", + "getdkan/sae" : "~1.0.1", + "getdkan/sql-parser": "~1.0.1", + "getdkan/lunr.php": "~1.0.0", "guzzlehttp/guzzle" : "6.3", "oomphinc/composer-installers-extender": "^1.1" },