From b09b01e83d8def47f3889b07b685f22ffd0e5be1 Mon Sep 17 00:00:00 2001
From: Chris Fiege <chris@tinyhost.de>
Date: Sun, 12 May 2019 20:20:41 +0200
Subject: [PATCH] Makefile: split into minimal and full env
Signed-off-by: Chris Fiege <chris@tinyhost.de>
---
.gitlab-ci.yml | 1 -
flamingo/Makefile | 16 ++++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69e6b4d..3d6f45d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ deployment:
script:
- cd flamingo
- echo $CI_COMMIT_REF_SLUG > REF_SLUG
- - make env
- make html
- touch /var/www/$CI_COMMIT_REF_SLUG/htdocs/foo
- rm -r /var/www/$CI_COMMIT_REF_SLUG/htdocs/*
diff --git a/flamingo/Makefile b/flamingo/Makefile
index 134e552..7a789d8 100644
--- a/flamingo/Makefile
+++ b/flamingo/Makefile
@@ -13,15 +13,23 @@ FLAMINGO_SERVER_ARGS=$(FLAMINGO_ARGS) --port=$(WEBSERVER_PORT) --host=$(WEBSERVE
all: server
# setup / clean ###############################################################
-$(PYTHON_VENV)/.created:
+$(PYTHON_VENV)/.created.deploy:
rm -rf $(PYTHON_VENV) && \
$(PYTHON) -m venv $(PYTHON_VENV) && \
. $(PYTHON_VENV)/bin/activate && \
pip install -r ./REQUIREMENTS-deploy.txt > $(PYTHON_VENV)/build.log 2>&1 && \
- (date > $(PYTHON_VENV)/.created) || \
+ (date > $(PYTHON_VENV)/.created.deploy) || \
(echo "\e[31m"; cat $(PYTHON_VENV)/build.log; echo "\e[0m"; exit 1)
-env: $(PYTHON_VENV)/.created
+deployenv: $(PYTHON_VENV)/.created.deploy
+
+$(PYTHON_VENV)/.created.full:
+ . $(PYTHON_VENV)/bin/activate && \
+ pip install -r ./REQUIREMENTS-full.txt > $(PYTHON_VENV)/build.log 2>&1 && \
+ (date > $(PYTHON_VENV)/.created.full) || \
+ (echo "\e[31m"; cat $(PYTHON_VENV)/build.log; echo "\e[0m"; exit 1)
+
+env: deployenv $(PYTHON_VENV)/.created.full
clean:
rm -rf $(FLAMINGO_OUTPUT)
@@ -31,7 +39,7 @@ distclean:
# build #######################################################################
-html: env
+html: deployenv
. $(PYTHON_VENV)/bin/activate && \
flamingo build $(FLAMINGO_ARGS)
--
GitLab