From a5b71de0e4ce30310090c6d6f187434fdca25ff9 Mon Sep 17 00:00:00 2001 From: "Adams, Kacy" Date: Tue, 25 Oct 2022 19:42:31 -0400 Subject: [PATCH 1/8] upload artifacts --- .github/workflows/maven.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 28339bc7..58300c15 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,6 +21,12 @@ jobs: - name: Build with Maven run: mvn clean compile assembly:single -Dmaven.skip.test=true + + - name: Upload jar + uses: actions/upload-artifact@v3 + with: + name: DEjar + path: target/defi-data-engine-0.0.1-jar-with-dependencies.jar # buildRestAPI: # runs-on: [ self-hosted ] From a36b337457fe877f960559f5f205f1b6ab868548 Mon Sep 17 00:00:00 2001 From: "Adams, Kacy" Date: Tue, 25 Oct 2022 19:43:53 -0400 Subject: [PATCH 2/8] try --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 58300c15..a968770b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,7 +26,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: DEjar - path: target/defi-data-engine-0.0.1-jar-with-dependencies.jar + path: defi-data-engine-0.0.1-jar-with-dependencies.jar # buildRestAPI: # runs-on: [ self-hosted ] From 225b2240e81a1f7126332cddb5dee85237a516d0 Mon Sep 17 00:00:00 2001 From: "Adams, Kacy" Date: Tue, 25 Oct 2022 19:47:49 -0400 Subject: [PATCH 3/8] upload action does not use wd setting :( --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a968770b..0b039c46 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,7 +26,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: DEjar - path: defi-data-engine-0.0.1-jar-with-dependencies.jar + path: "DeFi-Data-Engine/DeFi Data Engine/target/defi-data-engine-0.0.1-jar-with-dependencies.jar" # buildRestAPI: # runs-on: [ self-hosted ] From c0360aa1ea8fd86e021e2d8e1fde310c3dc217c6 Mon Sep 17 00:00:00 2001 From: "Adams, Kacy" Date: Tue, 25 Oct 2022 19:59:50 -0400 Subject: [PATCH 4/8] deploy test --- .github/workflows/maven.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0b039c46..2267144a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -28,6 +28,9 @@ jobs: name: DEjar path: "DeFi-Data-Engine/DeFi Data Engine/target/defi-data-engine-0.0.1-jar-with-dependencies.jar" + - name: Deploy data engine + run: java -jar defi-data-engine-0.0.1-jar-with-dependencies.jar & + # buildRestAPI: # runs-on: [ self-hosted ] # defaults: From e7d8b9f12b816467ab66a2a855419a79098fdd26 Mon Sep 17 00:00:00 2001 From: "Adams, Kacy" Date: Tue, 25 Oct 2022 20:00:58 -0400 Subject: [PATCH 5/8] dep test --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2267144a..f343ea0b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,7 +29,7 @@ jobs: path: "DeFi-Data-Engine/DeFi Data Engine/target/defi-data-engine-0.0.1-jar-with-dependencies.jar" - name: Deploy data engine - run: java -jar defi-data-engine-0.0.1-jar-with-dependencies.jar & + run: java -jar target/defi-data-engine-0.0.1-jar-with-dependencies.jar & # buildRestAPI: # runs-on: [ self-hosted ] From eb47a8662549813447df2d183d370c1805cde708 Mon Sep 17 00:00:00 2001 From: "Adams, Kacy" Date: Tue, 25 Oct 2022 20:07:55 -0400 Subject: [PATCH 6/8] see if we can protect the orphan process --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f343ea0b..108b85a3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,7 +29,7 @@ jobs: path: "DeFi-Data-Engine/DeFi Data Engine/target/defi-data-engine-0.0.1-jar-with-dependencies.jar" - name: Deploy data engine - run: java -jar target/defi-data-engine-0.0.1-jar-with-dependencies.jar & + run: RUNNER_TRACKING_ID="" && java -jar target/defi-data-engine-0.0.1-jar-with-dependencies.jar & # buildRestAPI: # runs-on: [ self-hosted ] From 7c3e0fbfb29e7c039f91de8403eba7f3fc6bcfb7 Mon Sep 17 00:00:00 2001 From: "Adams, Kacy" Date: Tue, 25 Oct 2022 20:13:45 -0400 Subject: [PATCH 7/8] check past deployments --- .github/workflows/maven.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 108b85a3..79ccdab8 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: jobs: - buildDataEngine: + buildandDeployDataEngine: runs-on: [ self-hosted ] defaults: @@ -22,11 +22,9 @@ jobs: - name: Build with Maven run: mvn clean compile assembly:single -Dmaven.skip.test=true - - name: Upload jar - uses: actions/upload-artifact@v3 - with: - name: DEjar - path: "DeFi-Data-Engine/DeFi Data Engine/target/defi-data-engine-0.0.1-jar-with-dependencies.jar" + #Deployment will fail if there are deployments which did not come from this workflow + - name: Check if existing deployments + run: pkill -f 'java -jar target/defi-data-engine-0.0.1-jar-with-dependencies.jar' - name: Deploy data engine run: RUNNER_TRACKING_ID="" && java -jar target/defi-data-engine-0.0.1-jar-with-dependencies.jar & From 56d39e6fa95c2c84828bf61d118a0bb8de1d43bd Mon Sep 17 00:00:00 2001 From: "Adams, Kacy" Date: Wed, 26 Oct 2022 00:37:41 -0400 Subject: [PATCH 8/8] finish build rest api --- .github/workflows/maven.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 79ccdab8..3916b423 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,22 +22,25 @@ jobs: - name: Build with Maven run: mvn clean compile assembly:single -Dmaven.skip.test=true - #Deployment will fail if there are deployments which did not come from this workflow - - name: Check if existing deployments - run: pkill -f 'java -jar target/defi-data-engine-0.0.1-jar-with-dependencies.jar' +# #Deployment will fail if there are deployments which did not come from this workflow +# - name: Check if existing deployments +# run: pkill -f 'java -jar target/defi-data-engine-0.0.1-jar-with-dependencies.jar' - name: Deploy data engine run: RUNNER_TRACKING_ID="" && java -jar target/defi-data-engine-0.0.1-jar-with-dependencies.jar & - # buildRestAPI: - # runs-on: [ self-hosted ] - # defaults: - # run: - # working-directory: "DeFi-Data-Engine/Rest Application/" + buildRestAPI: + runs-on: [ self-hosted ] + defaults: + run: + working-directory: "DeFi-Data-Engine/Rest Application/" - # steps: - # - uses: actions/checkout@v3 + steps: + - uses: actions/checkout@v3 - # - name: Build with Maven - # run: mvn -B package --file pom.xml + - name: Build with Maven + run: mvn clean compile assembly:single -Dmaven.skip.test=true + + - name: Deploy rest application + run: RUNNER_TRACKING_ID="" && java -jar target/rest-connection-4.3.3-jar-with-dependencies.jar &