[mod] travis build : travis uses ./manage.sh to install the geckodriver

./manage.sh don't build css that are built by ./manage.sh grunt_build
This commit is contained in:
Alexandre Flament 2017-08-13 13:45:02 +02:00
parent 57dc6b625f
commit d87eb4da61
2 changed files with 32 additions and 22 deletions

View File

@ -15,11 +15,10 @@ before_install:
- "sh -e /etc/init.d/xvfb start" - "sh -e /etc/init.d/xvfb start"
- npm install less less-plugin-clean-css grunt-cli - npm install less less-plugin-clean-css grunt-cli
- export PATH=`pwd`/node_modules/.bin:$PATH - export PATH=`pwd`/node_modules/.bin:$PATH
- ./manage.sh grunt_packages - ./manage.sh install_geckodriver ~/drivers
- mkdir -p ~/drivers; export PATH=~/drivers:$PATH; - export PATH=~/drivers:$PATH
- GECKODRIVER_URL="https://github.com/mozilla/geckodriver/releases/download/v0.18.0/geckodriver-v0.18.0-linux64.tar.gz";
- FILE=`mktemp`; wget "$GECKODRIVER_URL" -qO $FILE && tar xz -C ~/drivers -f $FILE geckodriver; rm $FILE; chmod 777 ~/drivers/geckodriver;
install: install:
- ./manage.sh npm_packages
- ./manage.sh update_dev_packages - ./manage.sh update_dev_packages
- pip install coveralls - pip install coveralls
script: script:

View File

@ -25,7 +25,7 @@ install_geckodriver() {
return return
fi fi
GECKODRIVER_VERSION="v0.18.0" GECKODRIVER_VERSION="v0.18.0"
PLATFORM=`python -c "import platform; print platform.system().lower(), platform.architecture()[0]"` PLATFORM=`python -c "import six; import platform; six.print_(platform.system().lower(), platform.architecture()[0])"`
case $PLATFORM in case $PLATFORM in
"linux 32bit" | "linux2 32bit") ARCH="linux32";; "linux 32bit" | "linux2 32bit") ARCH="linux32";;
"linux 64bit" | "linux2 64bit") ARCH="linux64";; "linux 64bit" | "linux2 64bit") ARCH="linux64";;
@ -34,16 +34,25 @@ install_geckodriver() {
"mac 64bit") ARCH="macos";; "mac 64bit") ARCH="macos";;
esac esac
GECKODRIVER_URL="https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-$ARCH.tar.gz"; GECKODRIVER_URL="https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-$ARCH.tar.gz";
if [ -z "$VIRTUAL_ENV" ]; then
echo "geckodriver can't be installed because VIRTUAL_ENV is not set, you should download it from\n $GECKODRIVER_URL" if [ -z $1 ]; then
exit if [ -z "$VIRTUAL_ENV" ]; then
echo "geckodriver can't be installed because VIRTUAL_ENV is not set, you should download it from\n $GECKODRIVER_URL"
exit
else
GECKODRIVER_DIR=$VIRTUAL_ENV/bin
fi
else else
echo "Installing $VIRTUAL_ENV from\n $GECKODRIVER_URL" GECKODRIVER_DIR=$1
FILE=`mktemp` mkdir -p $GECKODRIVER_DIR
wget "$GECKODRIVER_URL" -qO $FILE && tar xz -C $VIRTUAL_ENV/bin/ -f $FILE geckodriver
rm $FILE
chmod 777 $VIRTUAL_ENV/bin/geckodriver
fi fi
echo "Installing $GECKODRIVER_DIR from\n $GECKODRIVER_URL"
FILE=`mktemp`
wget "$GECKODRIVER_URL" -qO $FILE && tar xz -C $GECKODRIVER_DIR -f $FILE geckodriver
rm $FILE
chmod 777 $GECKODRIVER_DIR/geckodriver
} }
pep8_check() { pep8_check() {
@ -91,18 +100,20 @@ styles() {
build_style themes/courgette/less/style.less themes/courgette/css/style.css build_style themes/courgette/less/style.less themes/courgette/css/style.css
build_style themes/courgette/less/style-rtl.less themes/courgette/css/style-rtl.css build_style themes/courgette/less/style-rtl.less themes/courgette/css/style-rtl.css
build_style less/bootstrap/bootstrap.less css/bootstrap.min.css build_style less/bootstrap/bootstrap.less css/bootstrap.min.css
build_style themes/oscar/less/pointhi/oscar.less themes/oscar/css/pointhi.min.css
build_style themes/oscar/less/logicodev/oscar.less themes/oscar/css/logicodev.min.css
build_style themes/pix-art/less/style.less themes/pix-art/css/style.css build_style themes/pix-art/less/style.less themes/pix-art/css/style.css
build_style themes/simple/less/style.less themes/simple/css/searx.min.css # built using grunt
build_style themes/simple/less/style-rtl.less themes/simple/css/searx-rtl.min.css #build_style themes/oscar/less/pointhi/oscar.less themes/oscar/css/pointhi.min.css
#build_style themes/oscar/less/logicodev/oscar.less themes/oscar/css/logicodev.min.css
#build_style themes/simple/less/style.less themes/simple/css/searx.min.css
#build_style themes/simple/less/style-rtl.less themes/simple/css/searx-rtl.min.css
} }
grunt_packages() { npm_packages() {
echo '[!] Grunt packages: install dependencies' echo '[!] install NPM packages for oscar theme'
cd $BASE_DIR/searx/static/themes/oscar cd $BASE_DIR/searx/static/themes/oscar
npm install npm install
echo '[!] install NPM packages for simple theme'
cd $BASE_DIR/searx/static/themes/simple cd $BASE_DIR/searx/static/themes/simple
npm install npm install
} }
@ -124,7 +135,7 @@ help() {
Commands Commands
======== ========
grunt_packages - Download & install dependencies npm_packages - Download & install dependencies
grunt_build - Build js files grunt_build - Build js files
help - This text help - This text
locales - Compile locales locales - Compile locales
@ -142,4 +153,4 @@ Commands
[ "$(command -V "$ACTION" | grep ' function$')" = "" ] \ [ "$(command -V "$ACTION" | grep ' function$')" = "" ] \
&& help "action not found" \ && help "action not found" \
|| $ACTION || $ACTION $2