From a325e9680eea3a13e52465cf809dff11be316f07 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Mon, 18 Nov 2019 21:52:37 +0200 Subject: [PATCH 01/31] circle ci test --- .circleci/.config.yml | 30 ++++++++++++++++++++++++++ .gitlab-ci.yml | 50 ------------------------------------------- 2 files changed, 30 insertions(+), 50 deletions(-) create mode 100644 .circleci/.config.yml delete mode 100644 .gitlab-ci.yml diff --git a/.circleci/.config.yml b/.circleci/.config.yml new file mode 100644 index 000000000..0326b71da --- /dev/null +++ b/.circleci/.config.yml @@ -0,0 +1,30 @@ +version: 2.1 +jobs: + build_ui: + docker: + - image: node:latest + steps: + - checkout + - run: + name: changing directory + command: | + cd chameleon-client + - run: + name: installing dependencies + command: | + npm install + - run: + name: building ui + command: | + npm run build + - store_artifacts: + path: chameleon-client/dist + build_jar: + docker: + - image: maven:3.6.2-jdk-12 + steps: + - run: rm -r Main/src/main/resources/web/* + - run: mv chameleon-client/dist/* Main/src/main/resources/web + - run: cd Main + - run: mvn package + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 2d45f7ecc..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,50 +0,0 @@ -stages: - - build_ui - - build_jar - - deploy - -build_ui: - stage: build_ui - image: node:latest - only: - refs: - - master - script: - - cd chameleon-client - - npm install - - npm run build - artifacts: - paths: - - chameleon-client/dist - -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 - - cd Main - - mvn package - artifacts: - paths: - - Main/target -deploy: - stage: deploy - image: ubuntu:latest - only: - refs: - - master - before_script: - - apt-get update - - apt-get --yes install git ssh rsync - - git submodule update --init --recursive - script: - - 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/target - - rsync -e "ssh -o StrictHostKeyChecking=no" $(find . -name "chameleon-vision-*") "${SSH_HOST_ADRESS}" From 53926697c1a0f82029222d28eded4761dd72edba Mon Sep 17 00:00:00 2001 From: ori agranat Date: Mon, 18 Nov 2019 21:54:54 +0200 Subject: [PATCH 02/31] renamed file --- .circleci/{.config.yml => config.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .circleci/{.config.yml => config.yml} (100%) diff --git a/.circleci/.config.yml b/.circleci/config.yml similarity index 100% rename from .circleci/.config.yml rename to .circleci/config.yml From 9578e59b60a6257429783e21443657ecf364105c Mon Sep 17 00:00:00 2001 From: ori agranat Date: Mon, 18 Nov 2019 21:59:04 +0200 Subject: [PATCH 03/31] bugfixed file --- .circleci/config.yml | 6 +++--- .gitignore | 6 ++++++ Main/.settings/org.eclipse.jdt.core.prefs | 9 --------- 3 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 Main/.settings/org.eclipse.jdt.core.prefs diff --git a/.circleci/config.yml b/.circleci/config.yml index 0326b71da..082c2c239 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,8 +6,8 @@ jobs: steps: - checkout - run: - name: changing directory - command: | + name: changing directory + command: | cd chameleon-client - run: name: installing dependencies @@ -18,7 +18,7 @@ jobs: command: | npm run build - store_artifacts: - path: chameleon-client/dist + path: chameleon-client/dist build_jar: docker: - image: maven:3.6.2-jdk-12 diff --git a/.gitignore b/.gitignore index e1a08cb49..a495e4a21 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,9 @@ Main/target New client/chameleon-client/node_modules/ Main/dependency-reduced-pom.xml Main/src/main/java/META-INF + +Main/.settings/org.eclipse.jdt.core.prefs + +Main/.classpath + +Main/.project diff --git a/Main/.settings/org.eclipse.jdt.core.prefs b/Main/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6eecfaf0f..000000000 --- a/Main/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=12 -org.eclipse.jdt.core.compiler.compliance=12 -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=12 From faa59c4157ad5a8b3b11ab6e63f7c4d4e72a3ee8 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Mon, 18 Nov 2019 21:59:04 +0200 Subject: [PATCH 04/31] bugfixed file --- .circleci/config.yml | 8 ++++---- .gitignore | 6 ++++++ Main/.settings/org.eclipse.jdt.core.prefs | 9 --------- 3 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 Main/.settings/org.eclipse.jdt.core.prefs diff --git a/.circleci/config.yml b/.circleci/config.yml index 0326b71da..9967c58e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,8 +6,8 @@ jobs: steps: - checkout - run: - name: changing directory - command: | + name: changing directory + command: | cd chameleon-client - run: name: installing dependencies @@ -18,8 +18,8 @@ jobs: command: | npm run build - store_artifacts: - path: chameleon-client/dist - build_jar: + path: chameleon-client/dist + build_java: docker: - image: maven:3.6.2-jdk-12 steps: diff --git a/.gitignore b/.gitignore index e1a08cb49..a495e4a21 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,9 @@ Main/target New client/chameleon-client/node_modules/ Main/dependency-reduced-pom.xml Main/src/main/java/META-INF + +Main/.settings/org.eclipse.jdt.core.prefs + +Main/.classpath + +Main/.project diff --git a/Main/.settings/org.eclipse.jdt.core.prefs b/Main/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6eecfaf0f..000000000 --- a/Main/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=12 -org.eclipse.jdt.core.compiler.compliance=12 -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=12 From f48d4f804009b68c742a2d4d41f4588cfbcd73d8 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Mon, 18 Nov 2019 22:04:56 +0200 Subject: [PATCH 05/31] updated file --- .circleci/config.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9967c58e7..5767613e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,4 @@ -version: 2.1 +version: 2 jobs: build_ui: docker: @@ -27,4 +27,16 @@ jobs: - run: mv chameleon-client/dist/* Main/src/main/resources/web - run: cd Main - run: mvn package + +workflows: + version: 2 + build_and_deploy: + jobs: + - build_ui + - build_java: + requires: + - build_ui + # filters: + # branches: + # only: master From cedd20aa247155bd06be85e2cd138ff2b7ebada0 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 19:20:10 +0200 Subject: [PATCH 06/31] test for npm --- .circleci/config.yml | 49 +++++++++++--------------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5767613e0..1040b32ed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,42 +1,17 @@ -version: 2 +version: 2 # use CircleCI 2.0 jobs: build_ui: docker: - image: node:latest - steps: - - checkout - - run: - name: changing directory - command: | - cd chameleon-client - - run: - name: installing dependencies - command: | - npm install - - run: - name: building ui - command: | - npm run build - - store_artifacts: - path: chameleon-client/dist - build_java: - docker: - - image: maven:3.6.2-jdk-12 - steps: - - run: rm -r Main/src/main/resources/web/* - - run: mv chameleon-client/dist/* Main/src/main/resources/web - - run: cd Main - - run: mvn package -workflows: - version: 2 - build_and_deploy: - jobs: - - build_ui - - build_java: - requires: - - build_ui - # filters: - # branches: - # only: master - + steps: + + - checkout + + - run: cd chameleon-client + - run: npm install + - run: npm run build + + - store_artifacts: + path: chameleon-client/dist/* + \ No newline at end of file From 865bbc57362be2cb0b3af110e3fc60aeea192fdb Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 19:29:24 +0200 Subject: [PATCH 07/31] added workflow --- .circleci/config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1040b32ed..5b12a7b73 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,4 @@ -version: 2 # use CircleCI 2.0 +version: 2 jobs: build_ui: docker: @@ -14,4 +14,9 @@ jobs: - store_artifacts: path: chameleon-client/dist/* + +workflows: + build: + jobs: + - build_ui \ No newline at end of file From 15cb41b59afb51dfd3212ee16dc1d35cdc50bbd6 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 19:34:30 +0200 Subject: [PATCH 08/31] fixed workflow --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b12a7b73..914756157 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: path: chameleon-client/dist/* workflows: - build: + version: 2 + release: jobs: - - build_ui - \ No newline at end of file + - build_ui \ No newline at end of file From 3a2da0cc7d938eb0d57427b37af68627055c6686 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 20:08:05 +0200 Subject: [PATCH 09/31] bugfix --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 914756157..d3612775e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,7 @@ version: 2 jobs: build_ui: + working_directory: ~/ui docker: - image: node:latest From b89c3b5a503c8f53ea04ca1a323f285de6c9ddef Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 20:14:05 +0200 Subject: [PATCH 10/31] bugfix --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d3612775e..963daed08 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,20 +1,21 @@ version: 2 jobs: build_ui: - working_directory: ~/ui + working_directory: ~/project/chameleon-client docker: - image: node:latest steps: - - checkout + - checkout: + path: ~/project - run: cd chameleon-client - run: npm install - run: npm run build - store_artifacts: - path: chameleon-client/dist/* + path: dist/ workflows: version: 2 From a762211273dc216701e793c3fbc93f8d17b16f46 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 20:16:03 +0200 Subject: [PATCH 11/31] removed cd --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 963daed08..ea6f3d988 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,6 @@ jobs: - checkout: path: ~/project - - run: cd chameleon-client - run: npm install - run: npm run build From 5c66e8b5684dbaaeed41acc33e33fd2835109aab Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 20:41:43 +0200 Subject: [PATCH 12/31] added build jar --- .circleci/config.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ea6f3d988..e427783ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,6 @@ jobs: - image: node:latest steps: - - checkout: path: ~/project @@ -15,9 +14,21 @@ jobs: - store_artifacts: path: dist/ + + build_jar: + working_directory: ~/project/Main + docker: + - image: maven:3.6.2-jdk-12 + steps: + - run: rm -r src/main/resources/web/* + - run: ../chameleon-client/dist/* Main/src/main/resources/web + - run: mvn package + - store_artifacts: + path: target/ workflows: version: 2 release: jobs: - - build_ui \ No newline at end of file + - build_ui + - build_jar \ No newline at end of file From 6773058f8f4c910ae21032731087d30e05087021 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 20:45:05 +0200 Subject: [PATCH 13/31] bugfix --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e427783ff..7a0c54e3f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,4 +31,6 @@ workflows: release: jobs: - build_ui - - build_jar \ No newline at end of file + - build_jar: + requires: + - build_ui \ No newline at end of file From d23ad54f951753aa8454c52bd952394c3e883abb Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 20:52:08 +0200 Subject: [PATCH 14/31] added project checkout --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7a0c54e3f..259d552ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,6 +20,8 @@ jobs: docker: - image: maven:3.6.2-jdk-12 steps: + - checkout: + path: ~/project - run: rm -r src/main/resources/web/* - run: ../chameleon-client/dist/* Main/src/main/resources/web - run: mvn package From 8ac9f62abf0a896e7c99093f5c76dfcc3f81c92a Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 21:04:40 +0200 Subject: [PATCH 15/31] try presistant --- .circleci/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 259d552ff..1dec54fad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,11 @@ jobs: - store_artifacts: path: dist/ + - persist_to_workspace: + root: ~/ + paths: + - dist/ + build_jar: working_directory: ~/project/Main @@ -22,6 +27,9 @@ jobs: steps: - checkout: path: ~/project + - attach_workspace: + at: /project/chameleon-client + - run: rm -r src/main/resources/web/* - run: ../chameleon-client/dist/* Main/src/main/resources/web - run: mvn package From cc166a97cde00c4da73966613175bbe7f3cf4fb1 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 21:12:52 +0200 Subject: [PATCH 16/31] bug fix presistant --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1dec54fad..3546e433d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,8 +12,8 @@ jobs: - run: npm install - run: npm run build - - store_artifacts: - path: dist/ + # - store_artifacts: + # path: dist/ - persist_to_workspace: root: ~/ paths: From 6b89b042fa426a1b4221b0b10bb5334e1de585a6 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 21:17:41 +0200 Subject: [PATCH 17/31] another try` --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3546e433d..aacb73e83 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,9 +15,9 @@ jobs: # - store_artifacts: # path: dist/ - persist_to_workspace: - root: ~/ + root: chameleon-client paths: - - dist/ + - dist build_jar: From d644077a5ad75ff15ad0b106940edf3d494641d3 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 21:20:11 +0200 Subject: [PATCH 18/31] bugfix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aacb73e83..f1a9b63c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: # - store_artifacts: # path: dist/ - persist_to_workspace: - root: chameleon-client + root: . paths: - dist From 8c69121125adc76ac95d8fc16f9b7be3aa04787c Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 21:27:18 +0200 Subject: [PATCH 19/31] path bugfix --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f1a9b63c0..370d6048b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,10 +28,10 @@ jobs: - checkout: path: ~/project - attach_workspace: - at: /project/chameleon-client + at: /UI - run: rm -r src/main/resources/web/* - - run: ../chameleon-client/dist/* Main/src/main/resources/web + - run: /UI/dist/* Main/src/main/resources/web - run: mvn package - store_artifacts: path: target/ From 661ecc5031d1deeff45722d30cbd0187455a4a7d Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 21:30:00 +0200 Subject: [PATCH 20/31] forgot move command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 370d6048b..a549fa844 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: at: /UI - run: rm -r src/main/resources/web/* - - run: /UI/dist/* Main/src/main/resources/web + - run: mv /UI/dist/* Main/src/main/resources/web - run: mvn package - store_artifacts: path: target/ From f8f1a27e15c54d1199a617273d0a6defe3655535 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 21:34:45 +0200 Subject: [PATCH 21/31] bug fix in path --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a549fa844..18fee0e3d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: at: /UI - run: rm -r src/main/resources/web/* - - run: mv /UI/dist/* Main/src/main/resources/web + - run: mv /UI/dist/* src/main/resources/web - run: mvn package - store_artifacts: path: target/ From 6e1849fc295c9ef81754238ce8b02b5a4e336a37 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 22:16:25 +0200 Subject: [PATCH 22/31] added deploy --- .circleci/config.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 18fee0e3d..c361101ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,8 +12,6 @@ jobs: - run: npm install - run: npm run build - # - store_artifacts: - # path: dist/ - persist_to_workspace: root: . paths: @@ -36,6 +34,18 @@ jobs: - store_artifacts: path: target/ + deploy: + docker: + - image: cibuilds/github:0.10 + steps: + - attach_workspace: + at: ./ + - run: + name: Publish Release on GitHub" + command: | + VERSION=$(find . -name 'chameleon-vision-*.jar' | sed 's/.*chameleon-vision-//; s/.jar//' ) + ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ./$(find . -name "chameleon-vision-*") + workflows: version: 2 release: @@ -43,4 +53,7 @@ workflows: - build_ui - build_jar: requires: - - build_ui \ No newline at end of file + - build_ui + - deploy: + requires: + - build_jar \ No newline at end of file From f25ab4b0a44e37ce3956409f957a4858b33ab6c5 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 22:18:21 +0200 Subject: [PATCH 23/31] added artifact to jar --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c361101ce..42208316e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,6 +33,10 @@ jobs: - run: mvn package - store_artifacts: path: target/ + - persist_to_workspace: + root: ./target + paths: + - . deploy: docker: From 09597fc6be10d659083192cf53e60a32f68a9beb Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 22:53:28 +0200 Subject: [PATCH 24/31] test for ui --- .circleci/config.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 42208316e..76c724608 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,8 @@ jobs: path: ~/project - attach_workspace: at: /UI - + + - run: ls /UI/dist/* - run: rm -r src/main/resources/web/* - run: mv /UI/dist/* src/main/resources/web - run: mvn package @@ -60,4 +61,7 @@ workflows: - build_ui - deploy: requires: - - build_jar \ No newline at end of file + - build_jar + # filters: + # branches: + # only: master \ No newline at end of file From 7ed258ad106a3f20a50eaf3f0e3c76ce8f6d8460 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 23:03:50 +0200 Subject: [PATCH 25/31] force delete --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 76c724608..87528db65 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,8 +28,7 @@ jobs: - attach_workspace: at: /UI - - run: ls /UI/dist/* - - run: rm -r src/main/resources/web/* + - run: rm -rf src/main/resources/web/* - run: mv /UI/dist/* src/main/resources/web - run: mvn package - store_artifacts: From a9fa5935fba5e4d2d6315b53802b87a45e15aaee Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 23:13:55 +0200 Subject: [PATCH 26/31] deleting files and folders --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 87528db65..89172a72a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,6 +29,7 @@ jobs: at: /UI - run: rm -rf src/main/resources/web/* + - run: rm src/main/resources/web/* - run: mv /UI/dist/* src/main/resources/web - run: mvn package - store_artifacts: From 3d675fdf13ad71609a44d8ea34f4694f9d033890 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 23:22:28 +0200 Subject: [PATCH 27/31] force overight --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89172a72a..4e7b5da2c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,8 +29,7 @@ jobs: at: /UI - run: rm -rf src/main/resources/web/* - - run: rm src/main/resources/web/* - - run: mv /UI/dist/* src/main/resources/web + - run: mv -f /UI/dist/* src/main/resources/web - run: mvn package - store_artifacts: path: target/ From 5c4721f6c304c8ef8e008bf9007defa21680e4b9 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 23:50:44 +0200 Subject: [PATCH 28/31] trying copy --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e7b5da2c..a54e3cb61 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,8 @@ jobs: at: /UI - run: rm -rf src/main/resources/web/* - - run: mv -f /UI/dist/* src/main/resources/web + # - run: mv -f /UI/dist/* src/main/resources/web + - run: cp /UI/dist/. src/main/resources/web/ - run: mvn package - store_artifacts: path: target/ From 32301054afba9d4d5af40a58757530631b33a73b Mon Sep 17 00:00:00 2001 From: ori agranat Date: Tue, 19 Nov 2019 23:52:55 +0200 Subject: [PATCH 29/31] bugfix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a54e3cb61..cb14ec93a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: - run: rm -rf src/main/resources/web/* # - run: mv -f /UI/dist/* src/main/resources/web - - run: cp /UI/dist/. src/main/resources/web/ + - run: cp -r /UI/dist/. src/main/resources/web/ - run: mvn package - store_artifacts: path: target/ From 0e30e2773dbeae4fa4b67b8afdf45307b7163cc5 Mon Sep 17 00:00:00 2001 From: ori agranat Date: Wed, 20 Nov 2019 00:00:42 +0200 Subject: [PATCH 30/31] final ci config --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb14ec93a..50c8ddfba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,6 @@ jobs: at: /UI - run: rm -rf src/main/resources/web/* - # - run: mv -f /UI/dist/* src/main/resources/web - run: cp -r /UI/dist/. src/main/resources/web/ - run: mvn package - store_artifacts: @@ -62,6 +61,6 @@ workflows: - deploy: requires: - build_jar - # filters: - # branches: - # only: master \ No newline at end of file + filters: + branches: + only: master \ No newline at end of file From 6e7d109b8eb1725c44bc9c3685ddc780ca2e8a8e Mon Sep 17 00:00:00 2001 From: ori agranat Date: Wed, 20 Nov 2019 00:02:48 +0200 Subject: [PATCH 31/31] also build dev --- .circleci/config.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 50c8ddfba..24b8ba214 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,10 +54,20 @@ workflows: version: 2 release: jobs: - - build_ui + - build_ui: + filters: + branches: + only: + - master + - dev - build_jar: requires: - build_ui + filters: + branches: + only: + - master + - dev - deploy: requires: - build_jar