diff options
| 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 |
| commit | ba2c117725d8128a69184585ae290fb421939003 (patch) | |
| tree | dbe51b757b13aaae229e16121ab695652003b798 | |
| parent | 7e137ffa0fbf2a017607963c83a21355c7b87804 (diff) | |
| download | Ishtar-ba2c117725d8128a69184585ae290fb421939003.tar.bz2 Ishtar-ba2c117725d8128a69184585ae290fb421939003.zip | |
Fix CI and complete Makefile
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | Makefile.example | 17 |
2 files changed, 15 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65246de14..1606294f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ before_script: - apt update - - apt install -q -y git python3-pip libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python3-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc + - apt install -q -y git sed python3-pip libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python3-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc - apt-get install -q -y locales && \ sed -i -e "s/# fr_FR*/fr_FR.UTF-8 UTF-8/" /etc/locale.gen && \ dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=$LANG 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 |