Skip to content

GetDKAN/dkan-drops-7

This branch is 168 commits ahead of, 57 commits behind pantheon-systems/drops-7:master.

Folders and files

NameName
Last commit message
Last commit date

Latest commit

46bb89e · Sep 21, 2021
Sep 21, 2021
Sep 21, 2021
Sep 21, 2021
Sep 21, 2021
Sep 21, 2021
Sep 21, 2021
Oct 12, 2015
Mar 25, 2015
Jul 1, 2016
Nov 18, 2019
Sep 21, 2021
Nov 18, 2019
Sep 21, 2021
Sep 12, 2013
May 5, 2014
Feb 25, 2011
Feb 25, 2011
Oct 14, 2015
Feb 25, 2011
Jan 22, 2021
Feb 22, 2017
Feb 27, 2014
Oct 14, 2015
Nov 29, 2012
Feb 25, 2011
Feb 25, 2011
Dec 27, 2012
Jun 18, 2020
Jul 2, 2016
Dec 27, 2013
Sep 21, 2021
Feb 25, 2011

Repository files navigation

Fully Made Version of DKAN

This is a version of DKAN that has already been "made" with drush make. It includes Drupal core as well as the DKAN installation profile which can be found in "profiles/dkan".

To install, follow the same directions as Drupal core: https://www.drupal.org/documentation/install

See the main DKAN repository for further instructions, support, and community: http://github.com/nucivic/dkan

DKAN on Pantheon

This is a fork based on Pantheon DROPs

How to update Drupal Drop from Pantheon Git Repository

Just for the first time, add the pantheon base drop repo as a remote

git remote add pantheon https://github.com/pantheon-systems/drops-7.git

Any time you want to integrate their changes into this repo

# Make a branch so we can test if their work pass our testing
git checkout -b updating_from_pantheon_drops
# Pull their master into your branch (solve conflicts if any)
git merge pantheon/master -X theirs
# Push changes and wait for travis to run the build on the 'updating_from_pantheon_drops' branch.  
git push origin updating_from_pantheon_drops

Fix any issues with the build (if any) pushing commits. When everything is ok squash all your fix commits into one. Then:

# Checkout master
git checkout master
# Rebase changes from your branch
git rebase updating_from_pantheon_drops
# Push
git push origin master
# Delete integration branch
git push origin :updating_from_pantheon_drops

How to update dkan profile

# Make a branch so we can test the travis build sep
git checkout -b rebuilding_dkan_profile
# Run dkan update script
cd scripts
./rebuild-dkan.sh
# Add, Commit, Push and check the travis build for the 'rebuilding_dkan_profile' branch
git add ../profiles/dkan -A
git commit -m "Rebuilding dkan"
git push origin rebuilding_dkan_profile

Fix any issues with the build (if any) pushing commits. When everything is ok squash all your fix commits into one. Then:

# Checkout master
git checkout master
# Rebase changes from your branch
git rebase rebuilding_dkan_profile
# Push
git push origin master
# Delete integration branch
git push origin :rebuilding_dkan_profile

About

DKAN installation for Pantheon

Resources

License

Stars

Watchers

Forks

Packages

No packages published

Languages

  • PHP 46.9%
  • JavaScript 37.3%
  • HTML 11.3%
  • CSS 2.6%
  • Gherkin 0.4%
  • CoffeeScript 0.4%
  • Other 1.1%