Skip to content
Snippets Groups Projects
Commit ba3abcba authored by Vincent Texier's avatar Vincent Texier
Browse files

[enh] #817 change docker image to build AppImage

Image weight is smaller
Image include wget to build AppImage
Python >= 3.6.10 requirement is now the default
parent 09b272bf
Branches
Tags
No related merge requests found
...@@ -4,10 +4,7 @@ stages: ...@@ -4,10 +4,7 @@ stages:
- build - build
- release - release
variables: image: registry.duniter.org/docker/python3/sakia-builder:1.0.0
PYENV_PYTHON_VERSION: 3.5.5
image: registry.duniter.org/docker/python3/duniterpy-builder:0.0.7
# SUB-TASKS # SUB-TASKS
.push_to_github: .push_to_github:
...@@ -29,15 +26,6 @@ image: registry.duniter.org/docker/python3/duniterpy-builder:0.0.7 ...@@ -29,15 +26,6 @@ image: registry.duniter.org/docker/python3/duniterpy-builder:0.0.7
# github push # github push
- bash -c "git push --force --mirror github 2>&1 | grep -v duniter-gitlab; echo $?" - 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: .changes:
only: only:
changes: changes:
...@@ -53,28 +41,24 @@ image: registry.duniter.org/docker/python3/duniterpy-builder:0.0.7 ...@@ -53,28 +41,24 @@ image: registry.duniter.org/docker/python3/duniterpy-builder:0.0.7
# TASKS # TASKS
format: format:
extends: extends:
- .env
- .changes - .changes
stage: format stage: format
script: script:
- pyenv shell 3.6.4 # black install and run needs python 3.6.x minimum
- pip install -r requirements_dev.txt - pip install -r requirements_dev.txt
- make check-format - make check-format
tests: tests:
extends: extends:
- .env
- .changes - .changes
stage: tests stage: tests
script: script:
- pyenv shell 3.6.4 # black install needs python 3.6.x minimum
- pip install -r requirements.txt - pip install -r requirements.txt
- pip install -r requirements_dev.txt - pip install -r requirements_dev.txt
- /start.sh # start xvfb
- make tests - make tests
build: build:
extends: extends:
- .env
- .changes - .changes
stage: build stage: build
script: script:
...@@ -84,12 +68,10 @@ build: ...@@ -84,12 +68,10 @@ build:
release_appimage: release_appimage:
extends: extends:
- .env
- .changes - .changes
stage: release stage: release
when: manual when: manual
script: script:
- apt-get install wget
- pip install -r requirements.txt - pip install -r requirements.txt
- pip install -r requirements_deploy.txt - pip install -r requirements_deploy.txt
- make build - make build
...@@ -102,7 +84,6 @@ release_appimage: ...@@ -102,7 +84,6 @@ release_appimage:
release_pypi: release_pypi:
extends: extends:
- .env
- .push_to_github - .push_to_github
stage: release stage: release
when: manual when: manual
...@@ -115,7 +96,6 @@ release_pypi: ...@@ -115,7 +96,6 @@ release_pypi:
- master - master
release_pypi_test: release_pypi_test:
extends: .env
stage: release stage: release
when: manual when: manual
only: [tags, dev] only: [tags, dev]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment