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

CiviDist fails on BSD flavor of 'cp' with '-r -p' switch to '-R -p' #14523

Merged
merged 1 commit into from
Jun 14, 2019

Conversation

kcristiano
Copy link
Member

Overview

civicrm/civicrm-buildkit#452

When building Joomla tarballs on OSX the build will fail on the alternate Joomla install zip generation.

Specifically this occurs at https://github.com/civicrm/civicrm-core/blob/master/distmaker/dists/joomla_php5.sh#L40

cp -r -p civicrm com_civicrm/admin/civicrm fails on the symlinked file vendor/pear/log/README.rst

Changing the command to cp -R -p civicrm com_civicrm/admin/civicrm allows both cividist and distmaker to complete successfully.

Before

cividist fails for joomla-alt om MacOSX

After

cividist will complete on all platforms.

Technical Details

Switch to GNU style option of '-R' that is supported on both GNU and BSD

Comments

There will need to be diligent testing on all platforms, MACOSX, linux, bknx after merge

@civibot
Copy link

civibot bot commented Jun 14, 2019

(Standard links)

@civibot civibot bot added the master label Jun 14, 2019
@eileenmcnaughton
Copy link
Contributor

You know I feel like generating joomla! tarballs is such an obscure use case. If the main tarballs fail to load @totten will quickly notice & fix. This one fails fast, fails hard & only fails for truly geeky people if it does fail so I'm prepared to merge a little bit flippantly on your research & testing

@eileenmcnaughton eileenmcnaughton merged commit 2667048 into civicrm:master Jun 14, 2019
@kcristiano
Copy link
Member Author

@totten as discussed post merge I did the following:

Built tarballs of master on BSD - success
Built tarballs of 5.14.0, 5.13.5 on BSD - failure as expected
Built tarballs of master on GNU(debian) - success
Built tarballs of 5.14.0, 5.13.5 on GNU(debian) - success

@totten
Copy link
Member

totten commented Jun 19, 2019

Nice, so with this patch, master is working on both BSD+GNU. 👍

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