From d7523071a0ba8c210f7ece31d8e30f5c360966c3 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Thu, 26 Mar 2020 19:14:07 +0100 Subject: travis: use build environment from Makefile Signed-off-by: Markus Heiser --- .travis.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index e37b65864..ca986d04d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: python sudo: false cache: - - pip - - npm - directories: - $HOME/.cache/pip @@ -10,17 +8,16 @@ addons: firefox: "latest" install: - - ./manage.sh install_geckodriver ~/drivers - - export PATH=~/drivers:$PATH - - ./manage.sh npm_packages - - ./manage.sh update_dev_packages - - pip install codecov + - make install + - make gecko.driver + - make node.env + - local/py3/bin/pip install codecov script: - - ./manage.sh styles - - ./manage.sh grunt_build - - ./manage.sh tests + - make styles + - make themes + - make test after_success: - - ./manage.sh py_test_coverage + - make test.coverage - codecov stages: @@ -44,7 +41,7 @@ jobs: install: true script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - ./manage.sh docker_build push + - local/py3/bin/activate; ./manage.sh docker_build push after_success: true notifications: -- cgit v1.2.3 From ca65d41da569834435c226407370365224d7867c Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sun, 29 Mar 2020 12:22:02 +0200 Subject: [fix] travis: reomve 'make style' from travis build Commit 8a16903a removes Makefile target style Signed-off-by: Markus Heiser --- .travis.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ca986d04d..1667cd37c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ install: - make node.env - local/py3/bin/pip install codecov script: - - make styles - make themes - make test after_success: -- cgit v1.2.3 From d425e26e8018d633a98eabe1ce32abb32dd5e313 Mon Sep 17 00:00:00 2001 From: Dalf Date: Tue, 31 Mar 2020 11:59:54 +0200 Subject: [fix] fix travis build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 1667cd37c..8c3f7285c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ jobs: install: true script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - local/py3/bin/activate; ./manage.sh docker_build push + - make -e GIT_URL=$(git remote get-url origin) docker.push after_success: true notifications: -- cgit v1.2.3 From b18880985c0b5948ebb1136135d8d05d292aae70 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 11:15:34 +0200 Subject: travis: make travis build more verbose Signed-off-by: Markus Heiser --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 8c3f7285c..59913af90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,15 +8,15 @@ addons: firefox: "latest" install: - - make install - - make gecko.driver - - make node.env + - make V=1 install + - make V=1 gecko.driver + - make V=1 node.env - local/py3/bin/pip install codecov script: - - make themes - - make test + - make V=1 themes + - make V=1 test after_success: - - make test.coverage + - make V=1 test.coverage - codecov stages: -- cgit v1.2.3 From 8c145ff2fed095edb79461c3be7ad76abc68db51 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 12:22:08 +0200 Subject: travis: build on os: linux, dist: bionic, use platform arch: arm64 Signed-off-by: Markus Heiser --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 59913af90..c79c5c4c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ +os: linux +dist: bionic +arch: arm64 language: python -sudo: false cache: - directories: - $HOME/.cache/pip -- cgit v1.2.3 From 9b48ae47ec837250a9a15e26f85ada33b7aa4f71 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 14:16:49 +0200 Subject: makefile.python: hardening - drop virtualenv, drop build support py2 From py3.3 on a subset of virtualenv is built-in, so you can run '-m venv' ot of the box. - replace: $(PY_ENV_BIN)/pip --> $(PY_ENV_BIN)/python -m pip - remove obsolete virtualenv-exe target and adjust VTENV_OPTS - remove obsolete msg-pip-exe target - print list of py launchers available from $(PY_ENV_BIN) to the log - fix hard coded ./local Signed-off-by: Markus Heiser --- .travis.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index c79c5c4c5..911ca98e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ stages: jobs: include: - - python: "2.7" - python: "3.5" - python: "3.6" - stage: docker -- cgit v1.2.3 From 9e32fb27e71ca0ae32a0eead712a0504c9d2d951 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 14:49:10 +0200 Subject: [fix] travis: Permission denied: '/home/travis/.cache/pip/...' Fix "Permission denied: '/home/travis/.cache/" errors from travis build [1]. Change owner https://docs.travis-ci.com/user/caching/#caches-and-read-permissions and remove old log in the *before_caching* phase: https://docs.travis-ci.com/user/caching/#before_cache-phase About pip cache see: https://docs.travis-ci.com/user/caching/#pip-cache Signed-off-by: Markus Heiser [1] https://travis-ci.org/github/asciimoo/searx/jobs/669664131#L220 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 911ca98e1..94303773d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,9 @@ language: python cache: - directories: - $HOME/.cache/pip - +before_cache: + - sudo chown -R travis:travis $HOME/.cache/pip + - rm -f $HOME/.cache/pip/log/debug.log addons: firefox: "latest" -- cgit v1.2.3 From eb87b07d519592b8863a3aeb39eb0a758083f5cc Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 15:06:48 +0200 Subject: travis: disable cache Signed-off-by: Markus Heiser --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 94303773d..7d896fffe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,7 @@ os: linux dist: bionic arch: arm64 language: python -cache: - - directories: - - $HOME/.cache/pip -before_cache: - - sudo chown -R travis:travis $HOME/.cache/pip - - rm -f $HOME/.cache/pip/log/debug.log +cache: false addons: firefox: "latest" -- cgit v1.2.3 From adc3a855e6eb4626014c0459a13e868e65bcfd74 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 15:22:24 +0200 Subject: Revert "travis: disable cache" This reverts commit eb87b07d519592b8863a3aeb39eb0a758083f5cc. --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 7d896fffe..94303773d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,12 @@ os: linux dist: bionic arch: arm64 language: python -cache: false +cache: + - directories: + - $HOME/.cache/pip +before_cache: + - sudo chown -R travis:travis $HOME/.cache/pip + - rm -f $HOME/.cache/pip/log/debug.log addons: firefox: "latest" -- cgit v1.2.3 From e340bb5bd18c805bbb8381ec8c6052bf95830bc2 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 15:27:01 +0200 Subject: travis: remove platform option arm64 [1] https://github.com/asciimoo/searx/pull/1910#issuecomment-607244871 Signed-off-by: Markus Heiser --- .travis.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 94303773d..c9847d632 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ os: linux dist: bionic -arch: arm64 language: python cache: - directories: -- cgit v1.2.3 From 565493b57d3dbef94f4c298b7395e26fc24bb9bd Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 15:45:01 +0200 Subject: travis: use Makefile target travis.codecov to install codecov fix travis build error [1]:: The command "local/py3/bin/pip install codecov" failed and exited with 127 Use the correct pip (python environment) from build environment:: $(PY_ENV_BIN)/python -m pip [1] https://travis-ci.org/github/asciimoo/searx/jobs/669701405#L590 Signed-off-by: Markus Heiser --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index c9847d632..e9f727a32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ install: - make V=1 install - make V=1 gecko.driver - make V=1 node.env - - local/py3/bin/pip install codecov + - make V=1 travis.codecov script: - make V=1 themes - make V=1 test -- cgit v1.2.3 From 09a4062505a8d79451374139bab525457eeb28cd Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Apr 2020 17:21:26 +0200 Subject: makefile.python: partial revert off 9b48ae47, adds py2 support back revert "makefile.python: ... drop build support py2" to get back Py2 support. TPy2 support need virtualenv installed by the OS. BTW: log environment and python version in travis's install phase Signed-off-by: Markus Heiser --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index e9f727a32..3c862fac6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ addons: firefox: "latest" install: + - env; which python; python --version - make V=1 install - make V=1 gecko.driver - make V=1 node.env @@ -29,6 +30,8 @@ stages: jobs: include: + - python: "2.7" + env: PY=2 - python: "3.5" - python: "3.6" - stage: docker -- cgit v1.2.3 From 41f002b0ea3e82f9a2f7dd7b75dbbbf77b7986c0 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Thu, 2 Apr 2020 18:00:53 +0200 Subject: travis: remove before_cache handle BTW: separate env output in the travis log Signed-off-by: Markus Heiser --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 3c862fac6..76a20b00d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,12 @@ language: python cache: - directories: - $HOME/.cache/pip -before_cache: - - sudo chown -R travis:travis $HOME/.cache/pip - - rm -f $HOME/.cache/pip/log/debug.log addons: firefox: "latest" install: - - env; which python; python --version + - env + - which python; python --version - make V=1 install - make V=1 gecko.driver - make V=1 node.env -- cgit v1.2.3 From a7862ba3c1557fd39269dad3781a1909a8cff363 Mon Sep 17 00:00:00 2001 From: Dalf Date: Wed, 8 Apr 2020 15:34:01 +0200 Subject: [mod] .travis.yml: add Python 3.7 and Python 3.8 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 76a20b00d..f6fa9c985 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,10 @@ jobs: env: PY=2 - python: "3.5" - python: "3.6" + - python: "3.7" + - python: "3.8" - stage: docker - python: "3.6" + python: "3.8" git: depth: false services: -- cgit v1.2.3