From c34e91cb37fceae0b3db7cf838eef4e2a8628f25 Mon Sep 17 00:00:00 2001
From: Orestis <orestis.malaspinas@pm.me>
Date: Sat, 19 Feb 2022 13:20:34 +0100
Subject: [PATCH] save modifs
---
.gitlab-ci.yml | 19 ++++++++++---------
Makefile | 2 +-
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b169d5..8083002 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,15 +33,16 @@ before_script:
build_and_deploy:
script:
- pandoc -v
- - cd hakyll-bootstrap/cours/prog_seq
- - git pull origin master
- - cd ../math_tech_info
- - git pull origin master
- - cd ../isc_physics
- - git pull origin master
- - cd ../algo
- - git pull origin master
- - cd ../../..
+ # - cd hakyll-bootstrap/cours/prog_seq
+ # - git pull origin master
+ # - cd ../math_tech_info
+ # - git pull origin master
+ # - cd ../isc_physics
+ # - git pull origin master
+ # - cd ../algo
+ # - git pull origin master
+ # - cd ../../..
+ - make update
- make
- rsync -avzz css ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/
- rsync -avzz figs ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/
diff --git a/Makefile b/Makefile
index 392b9ed..8fb04e1 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ deploy: all
cp -r css site/
update:
- git submodule foreach git pull origin master
+ git submodule foreach 'git pull origin master || true'
clean:
rm -rf index.html
--
GitLab