Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffbs-website
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ffbs
ffbs-website
Commits
b09b01e8
Commit
b09b01e8
authored
May 12, 2019
by
chrissi^
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Makefile: split into minimal and full env
Signed-off-by:
Chris Fiege
<
chris@tinyhost.de
>
parent
e6ff2295
Pipeline
#1294
passed with stage
in 17 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
.gitlab-ci.yml
.gitlab-ci.yml
+0
-1
flamingo/Makefile
flamingo/Makefile
+12
-4
No files found.
.gitlab-ci.yml
View file @
b09b01e8
...
...
@@ -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/*
...
...
flamingo/Makefile
View file @
b09b01e8
...
...
@@ -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
:
deploy
env
.
$(PYTHON_VENV)
/bin/activate
&&
\
flamingo build
$(FLAMINGO_ARGS)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment