jenkins-bot has submitted this change and it was merged.

Change subject: Add jsduck support for MediaViewer
......................................................................


Add jsduck support for MediaViewer

Change-Id: Idef779ed4212d8d70710f5713eb2127dcc9bad39
---
M puppet/manifests/packages.pp
M puppet/manifests/roles.pp
2 files changed, 12 insertions(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/manifests/packages.pp b/puppet/manifests/packages.pp
index 7c56aa6..9bdd909 100644
--- a/puppet/manifests/packages.pp
+++ b/puppet/manifests/packages.pp
@@ -80,3 +80,10 @@
         provider => 'pip',
     }
 }
+
+class packages::jsduck {
+    package { 'jsduck':
+        ensure   => '4.10.4',
+        provider => 'gem',
+    }
+}
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index f7c1594..7a01889 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -789,7 +789,11 @@
     include role::mediawiki
     include role::multimedia
 
-    mediawiki::extension { 'MultimediaViewer': }
+    include packages::jsduck
+
+    mediawiki::extension { 'MultimediaViewer':
+        require => Package['jsduck'],
+    }
 }
 
 # == Class: role::hhvm

-- 
To view, visit https://gerrit.wikimedia.org/r/108858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idef779ed4212d8d70710f5713eb2127dcc9bad39
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: GergÅ‘ Tisza <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: GergÅ‘ Tisza <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to