summaryrefslogtreecommitdiff
path: root/Makefile.example
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-03-08 16:13:45 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-06-17 13:21:27 +0200
commitba2c117725d8128a69184585ae290fb421939003 (patch)
treedbe51b757b13aaae229e16121ab695652003b798 /Makefile.example
parent7e137ffa0fbf2a017607963c83a21355c7b87804 (diff)
downloadIshtar-ba2c117725d8128a69184585ae290fb421939003.tar.bz2
Ishtar-ba2c117725d8128a69184585ae290fb421939003.zip
Fix CI and complete Makefile
Diffstat (limited to 'Makefile.example')
-rw-r--r--Makefile.example17
1 files changed, 14 insertions, 3 deletions
diff --git a/Makefile.example b/Makefile.example
index 14e6032a4..16c060593 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -40,6 +40,7 @@ clean:
-rm -rf *~*
-find . -name '*.pyc' -exec rm {} \;
-find . -name '.*.swp' -exec rm {} \;
+ -find . -name "__pycache__" -exec rm -rf {} \;
-rm -rf dist ishtar.egg-info
update: clean syncdb compilemessages collectstatic
@@ -252,9 +253,19 @@ deb: clean
debuild -i -us -uc -b
push_install: clean
- tar cvjf install-ishtar-$(version).tar.bz2 install/
- scp install-ishtar-$(version).tar.bz2 root@git:/var/www/ishtar/install/
- rm install-ishtar-$(version).tar.bz2
+ INSTALL_PATH=/var/www/ishtar/install/ ; \
+ ARCHIVE_NAME=install-ishtar-$(version).tar.bz2 ; \
+ tar cvjf $$ARCHIVE_NAME install/ ; \
+ scp $$ARCHIVE_NAME root@git.iggdrasil.net:$$INSTALL_PATH ; \
+ rm $$ARCHIVE_NAME ;
+ #ifeq ($(BRANCH_NAME),master) \
+ # ssh root@git rm $$INSTALL_PATH"install-ishtar-latest.tar.bz2" ; \
+ # ssh root@git ln -s $$INSTALL_PATH$$ARCHIVE_NAME $$INSTALL_PATH"install-ishtar-latest.tar.bz2" ;\
+ #endif \
+ #ifeq ($(BRANCH_NAME),develop) \
+ # ssh root@git rm $$INSTALL_PATH"install-ishtar-develop.tar.bz2" ; \
+ # ssh root@git ln -s $$INSTALL_PATH$$ARCHIVE_NAME $$INSTALL_PATH"install-ishtar-develop.tar.bz2" ;\
+ #endif
sass:
./node_modules/node-sass/bin/node-sass scss/custom.scss --output-style compressed > ishtar_common/static/bootstrap/bootstrap.css