search

kalamuna / playbox

A playground for ambitious would-be code artists.
http://live-playbox.at.kalamuna.com/
GNU General Public License v2.0
5 stars 29 forks source link

Update to latest from Panopoly #122

Open RobLoach opened 8 years ago

RobLoach commented 8 years ago

Two possible methods:

  1. Open new branch
  2. Update through git cli remotes
  3. Send PR for the update

or

  1. Create a backup on pantheon
  2. Verify update is legit in multidev
  3. Pull code from pantheon and push into branch on github for PR
RobLoach commented 8 years ago

Opened at https://dashboard.pantheon.io/sites/f0072597-f475-4513-af94-13a33b630923#plb-122 , will require a git conflict resolution, option 1 above.

chhavi commented 8 years ago

I have updated panopoly to the latest version. I referred to the below documentation.

I've tested all the pages on my local setup and everything looks fine.

https://www.drupal.org/node/2272177. Pull request can be seen here - https://github.com/kalamuna/playbox/pull/124

andrewmallis commented 8 years ago

@chhavi – I am not clear from your comment which of the steps you followed from the linked doc. Either way, this site is hosted on Pantheon, so we should instead look to: https://pantheon.io/docs/articles/sites/code/applying-upstream-updates/

Panopoly tracks against https://github.com/populist/panopoly-drops-7 so in this context, it would look something like:

  git pull -Xtheirs git://github.com/populist/panopoly-drops-7.git master
  # resolve conflicts
  git push origin master

@RobLoach – at the end of the day, I would like the dashboard to reflect the updated changes, so please ensure our multidev reflects this. (the current plb-122 one doesn't).

sidenote: We have an upgrade multi-dev branch for this here: https://dashboard.pantheon.io/sites/f0072597-f475-4513-af94-13a33b630923#upgrade and I tried quickly applying the latest dashboard updates, but it fails. :(

chhavi commented 8 years ago

@andrewmallis I first opened the link of Pantheon, but it was asking for credentials. So i thought let's quickly explore the other options and see how it goes. I followed the manual steps to update panopoly. I also took the backup of overriden features using 'Features Override' module. I ran update.php twice and everything was working fine.

But i can also try updating it on Pantheon. I'll connect with @RobLoach to understand the current plb-122 status, and will take it forward.

chhavi commented 8 years ago

@andrewmallis I have updated panopoly as per your suggestion -

git pull -Xtheirs git://github.com/populist/panopoly-drops-7.git master # resolved conflicts git push origin new-branch

NOTE : Run update.php after pulling the code. Pull request is available here - #128