From da0f60ffb1feb3fd0d1f3968994fbc3ba4d2d50b Mon Sep 17 00:00:00 2001 From: Deepak Bomjan Date: Wed, 6 Sep 2023 16:15:22 +0545 Subject: [PATCH 1/2] ci: fix javascore build issue * fix uat deployment * fix artifact upload issue --- .github/workflows/build-and-publish-javascore.yml | 10 +++++----- .github/workflows/uat-deploy-java-contracts.yml | 4 ++-- contracts/javascore/build.gradle | 3 --- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-publish-javascore.yml b/.github/workflows/build-and-publish-javascore.yml index f698b30e..98148370 100644 --- a/.github/workflows/build-and-publish-javascore.yml +++ b/.github/workflows/build-and-publish-javascore.yml @@ -1,4 +1,4 @@ -name: Build and Publish Javascore Contracts +name: Build and Upload xcall-multi Contracts on: push: @@ -6,7 +6,7 @@ on: - "main" jobs: - deploy-contracts-uat: + build-and-upload-artifacts: runs-on: ubuntu-latest steps: @@ -18,12 +18,12 @@ jobs: run: | ./gradlew clean build ./gradlew optimizedJar - ./gradlew zipOutputJars + ./gradlew zipOutputOptimizedJars - name: Archive artifacts uses: actions/upload-artifact@v2 with: name: javascore-contracts - path: ./contracts/javascore/build/xcall-output-jars.zip + path: ./contracts/javascore/build/javascore-contracts.zip if-no-files-found: error - + \ No newline at end of file diff --git a/.github/workflows/uat-deploy-java-contracts.yml b/.github/workflows/uat-deploy-java-contracts.yml index 961ab646..c594d9ea 100644 --- a/.github/workflows/uat-deploy-java-contracts.yml +++ b/.github/workflows/uat-deploy-java-contracts.yml @@ -1,4 +1,4 @@ -name: Deploy Contracts After PR Merge to main branch +name: Deploy Contracts to uat node on: push: @@ -28,4 +28,4 @@ jobs: run: | ./gradlew clean build ./gradlew optimizedJar - ./gradlew deployToUat -PdeploymentENV=uat -PkeystoreName=$UAT_KEYSTORE_PATH -PkeystorePass=$UAT_PASSWD + ./gradlew xcall:deployToUat -PdeploymentENV=uat -PkeystoreName=$UAT_KEYSTORE_PATH -PkeystorePass=$UAT_PASSWD \ No newline at end of file diff --git a/contracts/javascore/build.gradle b/contracts/javascore/build.gradle index 92bf8510..c5bc4433 100644 --- a/contracts/javascore/build.gradle +++ b/contracts/javascore/build.gradle @@ -104,6 +104,3 @@ task zipOutputOptimizedJars(type: Zip) { archiveFileName = "javascore-contracts.zip" destinationDirectory = file("$buildDir") } - - - From e1f8e63c704a6d48702e98ffc00e3adb617eb037 Mon Sep 17 00:00:00 2001 From: Deepak Bomjan Date: Thu, 7 Sep 2023 10:14:47 +0545 Subject: [PATCH 2/2] chore: remove xcall only deployment --- .github/workflows/uat-deploy-java-contracts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/uat-deploy-java-contracts.yml b/.github/workflows/uat-deploy-java-contracts.yml index c594d9ea..679fc2cd 100644 --- a/.github/workflows/uat-deploy-java-contracts.yml +++ b/.github/workflows/uat-deploy-java-contracts.yml @@ -28,4 +28,4 @@ jobs: run: | ./gradlew clean build ./gradlew optimizedJar - ./gradlew xcall:deployToUat -PdeploymentENV=uat -PkeystoreName=$UAT_KEYSTORE_PATH -PkeystorePass=$UAT_PASSWD \ No newline at end of file + ./gradlew deployToUat -PdeploymentENV=uat -PkeystoreName=$UAT_KEYSTORE_PATH -PkeystorePass=$UAT_PASSWD \ No newline at end of file