diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-09 20:19:14 +0200 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-08-13 00:57:40 -0500 |
| commit | d18fe2094b42ccf2ee23b01c4cdcf58dc42aaf03 (patch) | |
| tree | d3f8b9a49d4485357719790386280143ee1566bf | |
| parent | 30f5b9a5b711b46f1065baf755e413ceced5646b (diff) | |
| download | gitlab-ce-d18fe2094b42ccf2ee23b01c4cdcf58dc42aaf03.tar.gz | |
Use new PhantomJS version
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rwxr-xr-x | scripts/prepare_build.sh | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8d54e768d3..34ab1f90fca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,7 @@ variables: USE_DB: "true" USE_BUNDLE_INSTALL: "true" GIT_DEPTH: "20" + PHANTOMJS_DEB: "phantomjs_2.1.1+dfsg-2_amd64.deb" before_script: - source ./scripts/prepare_build.sh diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 7e71a030901..9c5a9713189 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -20,10 +20,10 @@ if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then # Install phantomjs package pushd vendor/apt - if [ ! -e phantomjs_1.9.8-0jessie_amd64.deb ]; then - wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb + if [ ! -e "$PHANTOMJS_DEB" ]; then + wget -q "http://ftp.us.debian.org/debian/pool/main/p/phantomjs/$PHANTOMJS_DEB" fi - dpkg -i phantomjs_1.9.8-0jessie_amd64.deb + dpkg -i "$PHANTOMJS_DEB" popd # Try to install packages |