Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09654a8d authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

Merge branch 'sync_to_upstream' into 'master'

Sync to upstream

See merge request e/cloud/my-spot!59
parents a2c898f2 12644e59
Loading
Loading
Loading
Loading

.config.sh

0 → 100644
+55 −0
Original line number Diff line number Diff line
# -*- coding: utf-8; mode: sh -*-
# SPDX-License-Identifier: AGPL-3.0-or-later
# shellcheck shell=bash disable=SC2034
#
# This environment is used by ./utils scripts like filtron.sh or searx.sh.  The
# default values are *most flexible* and *best maintained*, you normally not
# need to change the defaults (except PUBLIC_URL).
#
# Before you change any value here you have to uninstall any previous
# installation.  Further is it recommended to backup your changes simply by
# adding them to you local brand (git branch)::
#
#     git add .config

# The public URL of the searx instance: PUBLIC_URL="https://mydomain.xy/searx"
# The default is taken from ./utils/brand.env.

PUBLIC_URL="${SEARX_URL}"

if [[ ${PUBLIC_URL} == "https://searx.me" ]]; then
    # hint: Linux containers do not have DNS entries, lets use IPs
    PUBLIC_URL="http://$(primary_ip)/searx"
fi

# searx.sh
# ---------

# SEARX_INTERNAL_URL="127.0.0.1:8888"

# Only change, if you maintain a searx brand in your searx fork.
# GIT_BRANCH="${GIT_BRANCH:-master}"

# filtron.sh
# ----------

# FILTRON_API="127.0.0.1:4005"
# FILTRON_LISTEN="127.0.0.1:4004"
# FILTRON_TARGET="127.0.0.1:8888"

# morty.sh
# --------

# morty listen address
# MORTY_LISTEN="127.0.0.1:3000"
# PUBLIC_URL_PATH_MORTY="/morty/"

# system services
# ---------------

# Common $HOME folder of the service accounts
# SERVICE_HOME_BASE="/usr/local"

# **experimental**: Set SERVICE_USER to run all services by one account, but be
# aware that removing discrete components might conflict!
# SERVICE_USER=searx
+2 −1
Original line number Diff line number Diff line
# to sync with .dockerignore
.coverage
coverage/
cache/
.installed.cfg
engines.cfg
env
@@ -15,7 +16,7 @@ setup.cfg
*/*.pyc
*~

node_modules/
/node_modules

.tx/

+3 −4
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ python:
  before_script:
    - ./manage.sh update_dev_packages
  script:
    - ./manage.sh pep8_check
    - make test.pep8

build:web:
  stage: build
@@ -20,8 +20,7 @@ build:web:
    - ./manage.sh update_dev_packages
  script:
    - ./manage.sh locales
    - ./manage.sh styles
    - ./manage.sh grunt_build
    - make V=1 themes.eelo

.build:docker:
  stage: build
@@ -65,7 +64,7 @@ test:unit:
  before_script:
    - ./manage.sh update_dev_packages
  script:
    - ./manage.sh py_test_coverage
    - make test.coverage
  coverage: '/TOTAL.*\s+(\d+%)$/'

.deploy:template:
+16 −15
Original line number Diff line number Diff line
os: linux
dist: bionic
language: python
sudo: false
cache:
  - pip
  - npm
  - directories:
    - $HOME/.cache/pip

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
  - env
  - which python; python --version
  - make V=1 install
  - make V=1 gecko.driver
  - make V=1 node.env
  - make V=1 travis.codecov
script:
  - ./manage.sh styles
  - ./manage.sh grunt_build
  - ./manage.sh tests
  - make V=1 themes
  - make V=1 test
after_success:
  - ./manage.sh py_test_coverage
  - make V=1 test.coverage
  - codecov

stages:
@@ -31,10 +29,13 @@ stages:
jobs:
  include:
    - python: "2.7"
      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:
@@ -44,7 +45,7 @@ jobs:
      install: true
      script:
        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
        - ./manage.sh docker_build push
        - make -e GIT_URL=$(git remote get-url origin) docker.push
      after_success: true

notifications:
+1 −0
Original line number Diff line number Diff line
@@ -123,3 +123,4 @@ generally made searx better:
- Vipul @finn0
- @CaffeinatedTech
- Robin Schneider @ypid
- @splintah
Loading