Skip to content

Commit

Permalink
Change dependencies to getdkan, and define better ranges. (#170)
Browse files Browse the repository at this point in the history
* Change dependencies to getdkan, and define better ranges
* Update CircleCI config
* Fix spacing in composer.json
* Fixing spacing, again
  • Loading branch information
fmizzell authored and thierrydallacroce committed Aug 5, 2019
1 parent 822f800 commit c84b26d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

0 comments on commit c84b26d

Please sign in to comment.