diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-09 20:25:11 +0200 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-08-13 00:57:40 -0500 |
| commit | e6173e056756cb65c60c16b02e3a36f84222b6e3 (patch) | |
| tree | 4d1ccf7d46c3e280dc5a3bf5479b447309dfc223 | |
| parent | d18fe2094b42ccf2ee23b01c4cdcf58dc42aaf03 (diff) | |
| download | gitlab-ce-e6173e056756cb65c60c16b02e3a36f84222b6e3.tar.gz | |
Install latest stable phantomjs
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | scripts/prepare_build.sh | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34ab1f90fca..be5614520a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ variables: USE_DB: "true" USE_BUNDLE_INSTALL: "true" GIT_DEPTH: "20" - PHANTOMJS_DEB: "phantomjs_2.1.1+dfsg-2_amd64.deb" + PHANTOMJS_VERSION: "2.1.1" before_script: - source ./scripts/prepare_build.sh diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 9c5a9713189..bfca5d76391 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -20,10 +20,11 @@ if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then # Install phantomjs package pushd vendor/apt - if [ ! -e "$PHANTOMJS_DEB" ]; then - wget -q "http://ftp.us.debian.org/debian/pool/main/p/phantomjs/$PHANTOMJS_DEB" + PHANTOMJS_FILE="phantomjs-$PHANTOMJS_VERSION-linux-x86_64" + if [ ! -d "$PHANTOMJS_FILE" ]; then + curl -q "https://bitbucket.org/ariya/phantomjs/downloads/$PHANTOMJS_FILE.tar.bz2" | tar jx fi - dpkg -i "$PHANTOMJS_DEB" + cp "$PHANTOMJS_FILE/bin/phantomjs" "/usr/bin/" popd # Try to install packages |