Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-30 12:12:53 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-30 12:12:53 +0300
commitb4d40c16c29ebbeb26a989edea38d68a22659005 (patch)
tree884dd6cb4476a6bd607882885b6a065d8d9ed869
parent15291c89745403c81aaf4225bc825c131e69a8ab (diff)
parentbb6ce2bb10734cfc45e488378acaa17000fdacc2 (diff)
Merge branch 'phantomjs' into 'master'
Use new phantomjs source Version 1.9 was removed from upstream [Debian repos](http://ftp.de.debian.org/debian/pool/main/p/phantomjs/) so I [used fpm](https://gitlab.com/axil/phantomjs-debian) to build our own Debian packages. Fixes #3722 See merge request !1924
-rwxr-xr-xscripts/prepare_build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index dca5e1c5db3..119cc90fc1e 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
if [ -f /.dockerinit ]; then
- wget -q http://ftp.de.debian.org/debian/pool/main/p/phantomjs/phantomjs_1.9.0-1+b1_amd64.deb
- dpkg -i phantomjs_1.9.0-1+b1_amd64.deb
+ wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb
+ dpkg -i phantomjs_1.9.8-0jessie_amd64.deb
apt-get update -qq
apt-get install -y -qq libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client