Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367131 )
Change subject: visualdiff: Remove manually built `uprightdiff`
......................................................................
visualdiff: Remove manually built `uprightdiff`
Since ec98c50e42d1ec it has been using the packaged version.
Change-Id: I9e0eb9e75af15c0b33970096b01799ea9d5c25bf
---
M modules/visualdiff/manifests/init.pp
1 file changed, 0 insertions(+), 14 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/visualdiff/manifests/init.pp
b/modules/visualdiff/manifests/init.pp
index f12d8d3..baf17e7 100644
--- a/modules/visualdiff/manifests/init.pp
+++ b/modules/visualdiff/manifests/init.pp
@@ -7,18 +7,10 @@
# of indic and other language wiki pages
include ::mediawiki::packages::fonts
- # build-essential and g++ are required to build uprightdiff
- # They can be skipped once we get a packaged version # from elsewhere.
$visualdiff_packages = [
'nodejs',
'npm',
'uprightdiff',
- # TODO: Remove packages needed for building once
- # packaged version of uprightdiff is tested
- 'build-essential',
- 'g++',
- 'libopencv-highgui-dev',
- 'libboost-program-options-dev',
]
require_package($visualdiff_packages)
@@ -64,11 +56,5 @@
owner => 'testreduce',
group => 'testreduce',
mode => '0775',
- }
-
- git::clone { 'integration/uprightdiff':
- owner => 'root',
- group => 'wikidev',
- directory => '/srv/uprightdiff',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/367131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9e0eb9e75af15c0b33970096b01799ea9d5c25bf
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
