diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d984cf411c0112cb1c5c9d0c95b7850f1e2017c1..e42762aa5c8a9902a64629060ef5032f25b38c4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,7 @@ stages: - build - release -variables: - PYENV_PYTHON_VERSION: 3.5.5 - -image: registry.duniter.org/docker/python3/duniterpy-builder:0.0.7 +image: registry.duniter.org/docker/python3/sakia-builder:1.1.0 # SUB-TASKS .push_to_github: @@ -29,15 +26,6 @@ image: registry.duniter.org/docker/python3/duniterpy-builder:0.0.7 # github push - bash -c "git push --force --mirror github 2>&1 | grep -v duniter-gitlab; echo $?" -.env: - before_script: - - export PYENV_ROOT="$HOME/.pyenv" - - export PATH="$PYENV_ROOT/bin:$PATH" - - eval "$(pyenv init -)" - - pyenv shell $PYENV_PYTHON_VERSION - - export PATH=/opt/qt/5.9/5.9.4/gcc_64/bin:$PATH - - export DISPLAY=:99 - .changes: only: changes: @@ -53,28 +41,24 @@ image: registry.duniter.org/docker/python3/duniterpy-builder:0.0.7 # TASKS format: extends: - - .env - .changes stage: format script: - - pyenv shell 3.6.4 # black install and run needs python 3.6.x minimum - pip install -r requirements_dev.txt - make check-format tests: extends: - - .env - .changes stage: tests script: - - pyenv shell 3.6.4 # black install needs python 3.6.x minimum - pip install -r requirements.txt - pip install -r requirements_dev.txt + - /start.sh # start xvfb - make tests build: extends: - - .env - .changes stage: build script: @@ -84,12 +68,10 @@ build: release_appimage: extends: - - .env - .changes stage: release when: manual script: - - apt-get install wget - pip install -r requirements.txt - pip install -r requirements_deploy.txt - make build @@ -102,7 +84,6 @@ release_appimage: release_pypi: extends: - - .env - .push_to_github stage: release when: manual @@ -115,7 +96,6 @@ release_pypi: - master release_pypi_test: - extends: .env stage: release when: manual only: [tags, dev]