From 411d84515e856737e7415b3c6aca99ae69a883ab Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 10:36:09 +0000
Subject: [PATCH 01/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..b6db094bd
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,13 @@
+stages:
+    - install
+    - build
+    
+install:
+    stage: install
+    script:
+        - echo "install"
+build:
+    stage: build
+    script:
+        - echo "build"
+

From b9078c49f8415e7ba55d881fabee01a5fcbf504d Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 10:47:50 +0000
Subject: [PATCH 02/21] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6db094bd..c8880b60f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,13 @@
 stages:
-    - install
-    - build
-    
-install:
-    stage: install
+    - build_ui
+    - build_jar
+build_ui:
+    image:node:latest
     script:
-        - echo "install"
-build:
-    stage: build
-    script:
-        - echo "build"
+        - cd chameleon-client
+        - npm install
+        - npm run build
+
+
+
 

From ead1c7768cef519336eb22e853c1ab66d912d98f Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 10:53:06 +0000
Subject: [PATCH 03/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c8880b60f..6fddab665 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,16 @@
 stages:
     - build_ui
     - build_jar
+    
 build_ui:
-    image:node:latest
+    stage: build_ui
+    image: node:latest
     script:
         - cd chameleon-client
         - npm install
         - npm run build
-
-
-
-
+        
+build_jar:
+    stage: build_jar
+    script:
+        - echo "hrllo"

From 11e018b2285bee11d4019199ae82f3a146048352 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 13:35:03 +0000
Subject: [PATCH 04/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fddab665..50a5baf92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,14 @@ build_ui:
         - cd chameleon-client
         - npm install
         - npm run build
+    artifacts:
+        paths:
+            - dist/
         
 build_jar:
     stage: build_jar
+    image: maven:3.6.2-jdk-12
     script:
-        - echo "hrllo"
+        - mv chameleon-client/dist/* Main/src/main/resources/web
+        - cd Main 
+        - mvn package
\ No newline at end of file

From 893adc510c7e54a13fd465b39f9e9e8c37f313c1 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 13:39:50 +0000
Subject: [PATCH 05/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50a5baf92..268f43d5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ build_ui:
         - npm run build
     artifacts:
         paths:
-            - dist/
+            - chameleon-client/dist
         
 build_jar:
     stage: build_jar

From e53ae9f0da814f073a14979639d5dc6557070e6c Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 14:15:33 +0000
Subject: [PATCH 06/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 268f43d5d..86b7b8570 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ build_jar:
     stage: build_jar
     image: maven:3.6.2-jdk-12
     script:
+        - rm Main/src/main/resources/web/*
         - mv chameleon-client/dist/* Main/src/main/resources/web
         - cd Main 
         - mvn package
\ No newline at end of file

From 7f5dad400dbaf01b051b5ffd8888b7f4b9cf5415 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 14:19:52 +0000
Subject: [PATCH 07/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86b7b8570..524e9370c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ build_jar:
     stage: build_jar
     image: maven:3.6.2-jdk-12
     script:
-        - rm Main/src/main/resources/web/*
+        - rm -r Main/src/main/resources/web/*
         - mv chameleon-client/dist/* Main/src/main/resources/web
         - cd Main 
         - mvn package
\ No newline at end of file

From 14e436c8f68f1216d58dd76c26223f05eaaa01b6 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 20:31:53 +0000
Subject: [PATCH 08/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 524e9370c..2e68b60bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,4 +20,9 @@ build_jar:
         - rm -r Main/src/main/resources/web/*
         - mv chameleon-client/dist/* Main/src/main/resources/web
         - cd Main 
-        - mvn package
\ No newline at end of file
+        - mvn package
+        - eval $(ssh-agent -s)
+        - bash -c 'ssh-add <(echo "${SSH_PRIVATE_KEY}")'
+        - mkdir -p ~/.ssh
+        - echo "${SSH_HOST_KEY}" > ~/.ssh/known_hosts
+        - rsync -e ssh ./target/chameleon-vision-$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) ${SSH_USER}@frs.sourceforge.net:/home/frs/project/ori-test/
\ No newline at end of file

From 1e2d5f0c109944a1ae5ed9e13ccf6c34aa19ed18 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 20:36:51 +0000
Subject: [PATCH 09/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e68b60bc..4f0da8b47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,8 @@ build_ui:
 build_jar:
     stage: build_jar
     image: maven:3.6.2-jdk-12
+    before_script:
+    - apk update && apk add openssh-client bash rsync
     script:
         - rm -r Main/src/main/resources/web/*
         - mv chameleon-client/dist/* Main/src/main/resources/web

From 2545d1bd130ae281af0f2f00f7681d7ea02117d7 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 21:08:04 +0000
Subject: [PATCH 10/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f0da8b47..ad2950e23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
     - build_ui
     - build_jar
+    - deploy
     
 build_ui:
     stage: build_ui
@@ -16,15 +17,22 @@ build_ui:
 build_jar:
     stage: build_jar
     image: maven:3.6.2-jdk-12
-    before_script:
-    - apk update && apk add openssh-client bash rsync
     script:
         - rm -r Main/src/main/resources/web/*
         - mv chameleon-client/dist/* Main/src/main/resources/web
         - cd Main 
         - mvn package
-        - eval $(ssh-agent -s)
-        - bash -c 'ssh-add <(echo "${SSH_PRIVATE_KEY}")'
-        - mkdir -p ~/.ssh
-        - echo "${SSH_HOST_KEY}" > ~/.ssh/known_hosts
-        - rsync -e ssh ./target/chameleon-vision-$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) ${SSH_USER}@frs.sourceforge.net:/home/frs/project/ori-test/
\ No newline at end of file
+    artifacts:
+        paths:
+        - Main/target
+deploy:
+    stage: deploy
+    image: publysher/hugo
+    script:
+      - hugo
+      - echo "${SSH_PRIVATE_KEY}" > id_rsa
+      - chmod 700 id_rsa
+      - mkdir "${HOME}/.ssh"
+      - echo "${SSH_HOST_KEY}" > "${HOME}/.ssh/known_hosts"
+      - cd Main
+      - rsync -e 'ssh -i id_rsa' target/chameleon-vision-$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/

From d25adba18eadd413519b59e81af3cbd0465a2a94 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 21:13:14 +0000
Subject: [PATCH 11/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad2950e23..c532fb323 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,6 @@ deploy:
     stage: deploy
     image: publysher/hugo
     script:
-      - hugo
       - echo "${SSH_PRIVATE_KEY}" > id_rsa
       - chmod 700 id_rsa
       - mkdir "${HOME}/.ssh"

From c8ba8a49f2defc074344236b0a8275da49d10c66 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 21:18:59 +0000
Subject: [PATCH 12/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c532fb323..906fbcdbc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,4 +34,4 @@ deploy:
       - mkdir "${HOME}/.ssh"
       - echo "${SSH_HOST_KEY}" > "${HOME}/.ssh/known_hosts"
       - cd Main
-      - rsync -e 'ssh -i id_rsa' target/chameleon-vision-$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/
+      - rsync -e 'ssh -i id_rsa' target/* oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/

From 257e2e16064429d64b71f998aa068fe2d3b2d318 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 21:28:56 +0000
Subject: [PATCH 13/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 906fbcdbc..6e6fe46cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,11 +27,15 @@ build_jar:
         - Main/target
 deploy:
     stage: deploy
-    image: publysher/hugo
+    image: monachus/hugo:latest
+    before_script:
+        - apt-get update
+        - apt-get --yes --force-yes install git ssh rsync
+        - git submodule update --init --recursive
     script:
-      - echo "${SSH_PRIVATE_KEY}" > id_rsa
-      - chmod 700 id_rsa
-      - mkdir "${HOME}/.ssh"
-      - echo "${SSH_HOST_KEY}" > "${HOME}/.ssh/known_hosts"
-      - cd Main
-      - rsync -e 'ssh -i id_rsa' target/* oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/
+        - echo "${SSH_PRIVATE_KEY}" > id_rsa
+        - chmod 700 id_rsa
+        - mkdir "${HOME}/.ssh"
+        - echo "${SSH_HOST_KEY}" > "${HOME}/.ssh/known_hosts"
+        - cd Main
+        - rsync -e 'ssh -i id_rsa' target/* oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/

From a7c2dfa80aca42be8a2135935d64dfbecf8b0c47 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 21:35:24 +0000
Subject: [PATCH 14/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e6fe46cf..fd505b9d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ deploy:
     image: monachus/hugo:latest
     before_script:
         - apt-get update
-        - apt-get --yes --force-yes install git ssh rsync
+        - apt-get --yes install git ssh rsync
         - git submodule update --init --recursive
     script:
         - echo "${SSH_PRIVATE_KEY}" > id_rsa

From f6e8dd2e6ad348e57cb889f2c24474e3bbb8c387 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 21:43:08 +0000
Subject: [PATCH 15/21] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd505b9d7..efc7c59fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,9 +33,9 @@ deploy:
         - apt-get --yes install git ssh rsync
         - git submodule update --init --recursive
     script:
-        - echo "${SSH_PRIVATE_KEY}" > id_rsa
-        - chmod 700 id_rsa
         - mkdir "${HOME}/.ssh"
         - echo "${SSH_HOST_KEY}" > "${HOME}/.ssh/known_hosts"
+        - echo "${SSH_PRIVATE_KEY}" > "${HOME}/.ssh/id_rsa"
+        - chmod 700 "${HOME}/.ssh/id_rsa"
         - cd Main
-        - rsync -e 'ssh -i id_rsa' target/* oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/
+        - rsync -e ssh  target/* oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/

From 48123e9e5eda4ef73da8f8822b4593b93f442cbd Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Fri, 8 Nov 2019 22:17:53 +0000
Subject: [PATCH 16/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efc7c59fb..f2ce7262d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,4 +38,4 @@ deploy:
         - echo "${SSH_PRIVATE_KEY}" > "${HOME}/.ssh/id_rsa"
         - chmod 700 "${HOME}/.ssh/id_rsa"
         - cd Main
-        - rsync -e ssh  target/* oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/
+        - rsync -e ssh  pom.xml oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/

From f322d094e0278b79264ec1174e553e1d09272e83 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Sat, 9 Nov 2019 10:08:42 +0000
Subject: [PATCH 17/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2ce7262d..bc63b197b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,4 +38,4 @@ deploy:
         - echo "${SSH_PRIVATE_KEY}" > "${HOME}/.ssh/id_rsa"
         - chmod 700 "${HOME}/.ssh/id_rsa"
         - cd Main
-        - rsync -e ssh  pom.xml oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/
+        - rsync -e "ssh -o StrictHostKeyChecking=no"  target/* oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/

From 513a0f1ad88624f693210ebe56eec06a690050d1 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Sat, 9 Nov 2019 10:34:49 +0000
Subject: [PATCH 18/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc63b197b..6288b67cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,5 +37,5 @@ deploy:
         - echo "${SSH_HOST_KEY}" > "${HOME}/.ssh/known_hosts"
         - echo "${SSH_PRIVATE_KEY}" > "${HOME}/.ssh/id_rsa"
         - chmod 700 "${HOME}/.ssh/id_rsa"
-        - cd Main
-        - rsync -e "ssh -o StrictHostKeyChecking=no"  target/* oriagranat9@frs.sourceforge.net:/home/frs/project/ori-test/
+        - cd Main/target
+        - rsync -e "ssh -o StrictHostKeyChecking=no"  $(find . -name "chameleon-vision-*") "${SSH_HOST_ADRESS}"

From 4614577d8cb58d2a17f1a80ae9d61beb3ca92e47 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Sat, 9 Nov 2019 10:41:36 +0000
Subject: [PATCH 19/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6288b67cb..e8b71e1bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ build_jar:
         - Main/target
 deploy:
     stage: deploy
-    image: monachus/hugo:latest
+    image: ubuntu:latest
     before_script:
         - apt-get update
         - apt-get --yes install git ssh rsync

From 7c69fed9aef0eadf7cfe644a542104abc4d199e3 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Sat, 9 Nov 2019 10:50:27 +0000
Subject: [PATCH 20/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8b71e1bf..f96cff96f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,11 @@ stages:
     - deploy
     
 build_ui:
-    stage: build_ui
+    stage: build ui
     image: node:latest
+    only:
+        refs:
+        - master
     script:
         - cd chameleon-client
         - npm install
@@ -15,8 +18,11 @@ build_ui:
             - chameleon-client/dist
         
 build_jar:
-    stage: build_jar
+    stage: build jar
     image: maven:3.6.2-jdk-12
+    only:
+        refs:
+        - master
     script:
         - rm -r Main/src/main/resources/web/*
         - mv chameleon-client/dist/* Main/src/main/resources/web
@@ -28,6 +34,9 @@ build_jar:
 deploy:
     stage: deploy
     image: ubuntu:latest
+    only:
+        refs:
+        - master
     before_script:
         - apt-get update
         - apt-get --yes install git ssh rsync

From bc0e4e8cdfd521f9566c017d872b72b5c6a96054 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Sat, 9 Nov 2019 10:50:59 +0000
Subject: [PATCH 21/21] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f96cff96f..2d45f7ecc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
     - deploy
     
 build_ui:
-    stage: build ui
+    stage: build_ui
     image: node:latest
     only:
         refs:
@@ -18,7 +18,7 @@ build_ui:
             - chameleon-client/dist
         
 build_jar:
-    stage: build jar
+    stage: build_jar
     image: maven:3.6.2-jdk-12
     only:
         refs: