From 816f32e6108517246a0c9f85a5456769b249cbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Wed, 9 Oct 2019 13:38:17 +0200 Subject: [PATCH] Fix alpine requirements in CI --- .gitlab-ci.yml | 12 +++++++++--- Makefile | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab2b33c..1b20c82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,14 +7,16 @@ stages: test: script: - - apk add --no-cache make gcc musl-dev yaml-dev + - apk add --no-cache make + - make ci-install-alpine-requirements - python setup.py install - make ci-install-python-requirements - make test build:images: script: - - apk add --no-cache docker make + - apk add --no-cache make + - make ci-install-alpine-requirements - python setup.py install - make ci-build-images tags: @@ -24,6 +26,7 @@ build:images: build:docs: script: - apk add --no-cache make + - make ci-install-alpine-requirements - pip install -r requirements/docs.txt - cd docs && make artifacts: @@ -34,6 +37,7 @@ build:docs: build:pypi: script: - apk add --no-cache make + - make ci-install-alpine-requirements - make ci-install-python-requirements - make package artifacts: @@ -43,7 +47,8 @@ build:pypi: deploy:images: script: - - apk add --no-cache docker make + - apk add --no-cache make + - make ci-install-alpine-requirements - python setup.py install - make ci-push-images only: @@ -55,6 +60,7 @@ deploy:images: deploy:pypi: script: - apk add --no-cache make + - make ci-install-alpine-requirements - make ci-install-python-requirements - make ci-pypi dependencies: diff --git a/Makefile b/Makefile index 303c85a..226ead8 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,9 @@ ci-info: ## Print info about environment python3 --version pip3 --version +ci-install-alpine-requirements: ## Install requirements for a python:alpine image + apk add --no-cache docker gcc musl-dev yaml-dev + ci-install-python-requirements: ## Install requirements pip3 install -U setuptools pip pip3 install -r requirements/dev.txt