Deprecate git submodule workflow for drush mk

[br2490]

• Started cleanup 1 Nov 17.
• Create new branch from master
• Cleanup the new branch by removing submodule structure.
• Verify final draft of new master branch and push to "master-draft" branch.
• Ping @patdunlavey

[patdunlavey]

Notes from our call. (see https://commonmedia.teamworkpm.net/#tasks/14023557?c=6235983)

The problem:

• Production and dev branches are no longer serving a useful purpose because code bases on prod and dev server boxes have unclean git status and cannot git pull without merge conflicts.
• Originally depended on git submodules for most (all?) drupal and islandora module management. However this system broke when a vendor used drush to update modules. And, submodules are just hard to work with, even in good circumstances.

The solution we agreed on:

• Production server will serve as the canonical code base until we can get it to a clean git status.
• Ben will checkout a new branch on the production server.
• On this branch he will break apart the code changes into commits with appropriate comments.
• Once clean, Ben will push this branch back to origin. At this point, it may make sense to set up the master branch as the canonical code base starting from this branch, merge that to production, and checkout the production branch on the production server.
• Probably working on the dev server, Ben will back out all the git submodules, and commit this code into an appropriate working branch.
• When merging back to master, we agreed to use pull requests, so that I and/or others can review his changes. Once master is up to date, it can be merged into production, and pulled on the production server.
• Moving forward, we will use a combination of drush up (for contrib modules and libraries) and drush make (for islandora modules and libraries) to manage code updates. As these updates are performed, they will be committed - preferably on a branch specific to the update task, then move through the workflow of pull request to master.

For now, Ben will shoulder the impetus for most of this work, and I will stand by to assist and advise, as needed.

Thanks!

[MarthaTenney]

is this complete? could this be a BD project?

[br2490]

Not complete - current git structure is partially deprecated on a new branch. 👍

…

On Thu, Jan 18, 2018 at 10:35 AM, Martha ***@***.***> wrote: is this complete? could this be a BD project? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#50 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ANhlbDLqpGOO-0BY8PAIOf0RHAWwmbDpks5tL2TUgaJpZM4QA1ex> .

-- Benjamin Rosner Instructional Applications Developer Barnard Library and Academic Information Services p: 212-854-9005 reachable on Google Chat. github: br2490