The panopoly_wysiwig.make file downloads a tarball based on the master branch of markitup version 1.x:

libraries[markitup][download][url] = https://github.com/markitup/1.x/tarball/master

It should download a tag or commit hash instead. Otherwise, the results of running the makefile may change even when the makefile itself has not changed.

CommentFileSizeAuthor
#7 change_markiupt_use_specific_revision-panopoly_wysywig-2403539-7.patch856 bytesfastangel
#5 change_markiupt_use_specific_revision-panopoly_wysywig-2403539-5.patch852 bytesfastangel
#3 change_markiupt_use_specific_revision-panopoly_wysywig-2403539-3.patch780 bytesfastangel

Comments

dsnopek’s picture

dsnopek
he/him
Primary language English
Location USA
commented

I concur! Can you make a URL that will download a tarball of the currently latest commit?

Depending on what the URL ends up being, we may need to update the packaging whitelist entry for markitup:

https://www.drupal.org/node/1509888

(As a security team member, this is something I can do once we know the URL)

cboyden’s picture

cboyden commented

Here's a link to download a .zip file based on the latest commit:
https://github.com/markitup/1.x/archive/c14c2a371836385eed4f500d5513c1a6...

Can a makefile clone a specific revision of a library from Github? If so, the recipe might look like this:

libraries[markitup][download][type] = git
libraries[markitup][download][url]= https://github.com/markitup/1.x
libraries[markitup][download][revision] = c14c2a3
libraries[markitup][patch][1715642] = http://drupal.org/files/1715642-adding-html-set-markitup-editor.patch
fastangel’s picture

fastangel commented
Status: Active » Needs review
StatusFileSize
new change_markiupt_use_specific_revision-panopoly_wysywig-2403539-3.patch780 bytes

I created a patch with the last commit instead use only the branch. Other solution is use http://markitup.jaysalvat.com//downloads/download.php?id=releases/latest that is the url to download the last release.

dsnopek’s picture

dsnopek
he/him
Primary language English
Location USA
commented
Status: Needs review » Needs work

@fastangel: Thanks for the patch!

+++ b/panopoly_wysiwyg.make
@@ -35,6 +35,7 @@ libraries[tinymce][download][type] = get
+projects[markitup][download][revision] = 2c88c42
+projects[markitup][download][branch] = master

This doesn't look quite right - it definitely shouldn't be "projects[markitup]" but "libraries[markitup]".

Also, Drush doesn't know where to download libraries from, so we probably have to specify the URL to the Git repo.

I think this needs to be closer to what cboyden suggested in #2, but I haven't actually tried that.

fastangel’s picture

fastangel commented
Status: Needs work » Needs review
StatusFileSize
new change_markiupt_use_specific_revision-panopoly_wysywig-2403539-5.patch852 bytes

ohh yes sorry I attach the right patch.

dsnopek’s picture

dsnopek
he/him
Primary language English
Location USA
commented
Status: Needs review » Needs work

Thanks! I tested it and that works with drush make, but I think that the URL needs to be changed to match the Drupal.org whitelist entry.

From:

libraries[markitup][download][url]= https://github.com/markitup/1.x

To (adding ".git" on the end):

libraries[markitup][download][url]= https://github.com/markitup/1.x.git

Here is cool drush extension that will automatically test this for you:

https://www.drupal.org/project/drupalorg_drush

After installing, you should be able to run drush verify-makefile panopoly_wysiwyg.make and it'll tell you if all the entries match the whitelist or not.

fastangel’s picture

fastangel commented
Status: Needs work » Needs review
StatusFileSize
new change_markiupt_use_specific_revision-panopoly_wysywig-2403539-7.patch856 bytes

Thank you dsnopek I didn't know the extension :) thanks for the help.

  • dsnopek committed a29fe17 on 7.x-1.x 
    Update Panopoly WYSIWYG for Issue #2403539 by fastangel: Makefile...
dsnopek’s picture

dsnopek
he/him
Primary language English
Location USA
commented
Status: Needs review » Fixed

Thanks! Committed. :-)

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.