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 - Add civicrm-setup. Build civicrm-*-wporg.zip #11576

Merged
merged 3 commits into from
Jan 24, 2018

Conversation

totten
Copy link
Member

@totten totten commented Jan 23, 2018

Overview

This patch adds a new library, civicrm-setup, to the list of dependencies. The library is roughly akin to civicrm/install/index.php, but it provides a defined API, more documentation, and more readable/digestable files. (Related: Draft blog: https://gist.github.com/totten/4b8d0b447f89763fe7781d3fc31d3656 )

The library only operates on an opt-in basis: all the existing builds/installers should continue to work as before, unless they take some special action to use the new one.

Before

  • None of the installer tarballs/zipballs include a copy of civicrm-setup.
  • distmaker generates civicrm-X.Y.Z-wordpress.zip, which uses the existing civicrm/install/index.php.

After

  • All of the installer tarballs/zipballs include a copy of civicrm-setup.
  • distmaker generates civicrm-X.Y.Z-wordpress.zip, which uses the existing civicrm/install/index.php. (Same as before.)
  • distmaker generates civicrm-X.Y.Z-wporg.zip, which uses civicrm-setup. This ZIP file is identical, save for two changes:
    • It adds the file .use-civicrm-setup to activate the new installer.
    • It enables plugin/blocks/opt-in, which displays a set of "Opt-in" buttons on the install screen.
  • All existing builds still use their old installers. The only ways to use the new one:
    • Download and activate civicrm-*-wporg.zip on WordPress, or...
    • Download the WordPress, D7, or Backdrop builds. Use the command cv core:install to perform installation.

Comments

This is a replacement for #11573 which aims to use a simpler distribution-channel.

Depends: civicrm/civicrm-wordpress#122

To test, I did this on a local machine:

  • Manually ran distmaker to create tar/zip files.
  • Used civihydra to build new test sites and to extract all the tar/zip files.
  • Logged into each site and ran the web-based installer.
  • (Tested with *-wordpress.zip, *-wporg.zip, *-drupal.tar.gz, *-backdrop.tar.gz, and *-joomla.zip),

As expected, the *-wporg.zip displayed the new installer, and all other packages used the old installer. All installer worked as expected locally.


----------------------------------------
* CRM-16421: Work to get CiviCRM for WordPress in WordPress' official Repository
  https://issues.civicrm.org/jira/browse/CRM-16421
----------------------------------------
* CRM-16421: Work to get CiviCRM for WordPress in WordPress' official Repository
  https://issues.civicrm.org/jira/browse/CRM-16421
@totten
Copy link
Member Author

totten commented Jan 23, 2018

jenkins, test this please

@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 ae130e0 into civicrm:master Jan 24, 2018
@totten totten deleted the master-wporg2 branch January 24, 2018 22:19
@mlutfy mlutfy added this to the 4.7.31 milestone Feb 9, 2018
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.

4 participants