BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/184072
Change subject: Bundle git installers in ISO image
......................................................................
Bundle git installers in ISO image
Bug: T71206
Change-Id: I42ecf6f6696935fe5068b3e1278033f15556f3c7
---
M support/packager/package.rb
M support/packager/urls.yaml
2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/72/184072/1
diff --git a/support/packager/package.rb b/support/packager/package.rb
index 8379fc6..de4eada 100755
--- a/support/packager/package.rb
+++ b/support/packager/package.rb
@@ -137,12 +137,14 @@
mac_dir = $contents_dir + 'Mac'
download_file(mac_dir, $url_config['VirtualBox']['Mac'])
download_file(mac_dir, $url_config['Vagrant']['Mac'])
+ download_file(mac_dir, $url_config['Git']['Mac'])
end
def windows()
windows_dir = $contents_dir + 'Windows'
download_file(windows_dir, $url_config['VirtualBox']['Windows'])
download_file(windows_dir, $url_config['Vagrant']['Windows'])
+ download_file(windows_dir, $url_config['Git']['Windows'])
end
def build_iso()
diff --git a/support/packager/urls.yaml b/support/packager/urls.yaml
index 264677f..d819c83 100644
--- a/support/packager/urls.yaml
+++ b/support/packager/urls.yaml
@@ -118,3 +118,12 @@
vagrant-vbguest:
url: https://rubygems.org/downloads/vagrant-vbguest-0.10.0.gem
sha256: 5eadad72fc80d2ae78463966654dab1f5e4d9803e084a4ff2c85a01be23ff105
+
+Git:
+ Mac:
+ url:
http://iweb.dl.sourceforge.net/project/git-osx-installer/git-2.2.1-intel-universal-mavericks.dmg
+ sha256: f9b1d926736a7d5dbcff2ffe0920ae25c03b9880d4e218e23e3c06c231ba6b63
+
+ Windows:
+ url:
https://s3.amazonaws.com/github-cloud/releases/325827/e8237682-8701-11e4-9dbe-7fb433262871.exe?response-content-disposition=attachment%3B%20filename%3DGit-1.9.5-preview20141217.exe&response-content-type=application/octet-stream&AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&Expires=1420854625&Signature=yV4yIngIM5ns31s59eeqXIxRxHk%3D
+ shar256: d7e78da2251a35acd14a932280689c57ff9499a474a448ae86e6c43b882692dd
--
To view, visit https://gerrit.wikimedia.org/r/184072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42ecf6f6696935fe5068b3e1278033f15556f3c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
