From af257ee4c806acf8c7848911ca4a12b0e1a97be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Aaron=20M=C3=B6ck?=
 <tim_aaron.moeck@reutlingen-university.de>
Date: Thu, 16 Sep 2021 09:34:28 +0000
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4574f3..a83a7dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,26 +9,30 @@ linux:
     script:
         - git clone https://oauth2:$TOKEN_TAMPLATE_REPO@gitlab.reutlingen-university.de/letsgoing/internal/templates.git template
         - git clone https://oauth2:$TOKEN_LIN_REPO@gitlab.reutlingen-university.de/letsgoing/ardublock-ide-lin.git remote
-        - cd template/ArduBlock_Arduino_IDE
-        - ls -la
-        #- bash ./generateREADME.sh -o ../../remote/README.md -s Linux -v dev2 -d "hallo" -d welt
-        - sh -c "bash ./generateREADME.sh -s Linux -o ../../remote/README.md -v dev2 $(echo $(grep -Ei "###" ../../README.md | grep -Eiv "####" | sed "s/^/-d \"/" | sed "s/$/ \"/" | sed "s/### //g"))"
-        - cd ../../remote
+        #checkout brach in linus repo
+        - cd remote
         - git config user.email "cicd@letsgoing.de"
         - git config user.name "CICD Pipline"
         - git checkout dev2
+        #generate new README.md from Tamplates
+        - cd ../template/ArduBlock_Arduino_IDE
+        #- bash ./generateREADME.sh -o ../../remote/README.md -s Linux -v dev2 -d "hallo" -d welt
+        - sh -c "bash ./generateREADME.sh -s Linux -o ../../remote/README.md -v dev2 $(echo $(grep -Ei "###" ../../README.md | grep -Eiv "####" | sed "s/^/-d \"/" | sed "s/$/ \"/" | sed "s/### //g"))"
+        #Remove ArduBlock and add new Version
+        - cd ../../remote
         - cd ArduBlockTool/tool/
         - sh -c '{ rm *.jar; } || { echo "error"; }'
         - cp ../../../ArduBlockTool/tool/*.jar . 
         - cd ../../ 
         - ls -la
+        #commit and add all to liunx repo
         - >         
             if [ -z "$(git status --porcelain)" ]; then         
                 # Working directory clean           
                 echo "Working directory clean";       
             else         
                 # Uncommitted changes 
-                git add ArduBlockTool/tool/*.jar    
+                git add .    
                 git commit -a -m "new $(< ../version.txt)";           
                 git push -u origin $CI_COMMIT_BRANCH;         
             fi
-- 
GitLab