Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-16421 - Installation - Update to newer protocol #122

Merged
merged 1 commit into from
Jan 24, 2018

Conversation

totten
Copy link
Member

@totten totten commented Jan 23, 2018

This is a follow-up to the recently-merged #121.

In #121, it was expected that some systems would opt-in to using the new installer, and others would opt-out. The mechanism for opt-in/opt-out was to download (or not download) the civicrm-setup folder.

This patch revises the protocol -- you can download the civicrm-setup folder regardless of preference. To indicate the preferred installer, create (or delete) a file named .use-civicrm-setup. In terms of the overall build/distribution infrastructure, it's easier to support this protocol.


To simplify the overall build/distribution process, this patch allows us to
include the `civicrm-setup` code with all builds. (Thus, it can be listed
as a dependency in `composer.json`.) The opt-in/opt-out mechanism is
a placeholder file in `${civicrm-core}/.use-civicrm-setup`.
@kcristiano
Copy link
Member

Tested:

Built via distmaker adding the two related patches

created wp-empty and drupal empty via buildkit
Installed civicrm using *-drupal.tgz and *-wordpress.zip on these sites. Used existing installer, Install successfull

Installed on Joomla Test site, installed CiviCRM using *-joomla.zip. Used existing Installer, Install successful

created wp-empty via buildkit
Installed civicrm via *-wporg.zip
New Installer, successful install

@totten this looks good for merge

@totten
Copy link
Member Author

totten commented Jan 24, 2018

Coo. I know it's a bit tricky to test this stuff (what with distmaker and multiple patches). So thank you, @kcristiano !

@totten totten merged commit c949451 into civicrm:master Jan 24, 2018
@totten totten deleted the master-setup2 branch January 24, 2018 22:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants