From a73b05e20ab5b9b77d1161a3415b3c561d35545f Mon Sep 17 00:00:00 2001 From: jayesh12234 <111957576+jayesh12234@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:49:43 +0530 Subject: [PATCH 1/4] Update entrypoint.sh Signed-off-by: jayesh12234 <111957576+jayesh12234@users.noreply.github.com> --- uitest-resident/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uitest-resident/entrypoint.sh b/uitest-resident/entrypoint.sh index 4c67b85d..839850b5 100644 --- a/uitest-resident/entrypoint.sh +++ b/uitest-resident/entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/bash java --version -java -jar residentui-*-jar-with-dependencies.jar +java -jar uitest-resident-*-jar-with-dependencies.jar From 0bca8671e8c294950c64c5815cd8b6f374212ba5 Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Fri, 27 Sep 2024 13:45:20 +0530 Subject: [PATCH 2/4] MOSIP-33383 Signed-off-by: Jayesh Kharode --- .github/workflows/push-trigger.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 7e585a57..5a8d3ae6 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -17,14 +17,13 @@ on: - '!release-branch' - release-* - master - - develop - - develop-* + - develop* - 1* - MOSIP* jobs: build-resident-ui: - uses: mosip/kattu/.github/workflows/npm-build.yml@master + uses: mosip/kattu/.github/workflows/npm-build.yml@master-java21 with: SERVICE_LOCATION: ./resident-ui BUILD_ARTIFACT: resident-ui @@ -42,7 +41,7 @@ jobs: BUILD_ARTIFACT: 'resident-ui' fail-fast: false name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master + uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21 with: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} SERVICE_NAME: ${{ matrix.SERVICE_NAME }} @@ -57,7 +56,7 @@ jobs: sonar-analysis: needs: build-resident-ui if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/npm-sonar-analysis.yml@master + uses: mosip/kattu/.github/workflows/npm-sonar-analysis.yml@master-java21 with: SERVICE_LOCATION: resident-ui SONAR_URL: 'https://sonarcloud.io' @@ -92,7 +91,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 21 + java-version: '21' server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml settings-path: ${{ github.workspace }} # location for the settings.xml file From c8ffd7a25bb61726c0ca88dbfeb49e32c0803f33 Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Fri, 27 Sep 2024 13:52:58 +0530 Subject: [PATCH 3/4] MOSIP-33383 Signed-off-by: Jayesh Kharode --- .github/workflows/push-trigger.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 5a8d3ae6..fc7eee57 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -23,7 +23,7 @@ on: jobs: build-resident-ui: - uses: mosip/kattu/.github/workflows/npm-build.yml@master-java21 + uses: mosip/kattu/.github/workflows/npm-build.yml@master with: SERVICE_LOCATION: ./resident-ui BUILD_ARTIFACT: resident-ui @@ -41,7 +41,7 @@ jobs: BUILD_ARTIFACT: 'resident-ui' fail-fast: false name: ${{ matrix.SERVICE_NAME }} - uses: mosip/kattu/.github/workflows/docker-build.yml@master-java21 + uses: mosip/kattu/.github/workflows/docker-build.yml@master with: SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} SERVICE_NAME: ${{ matrix.SERVICE_NAME }} @@ -56,7 +56,7 @@ jobs: sonar-analysis: needs: build-resident-ui if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/npm-sonar-analysis.yml@master-java21 + uses: mosip/kattu/.github/workflows/npm-sonar-analysis.yml@master with: SERVICE_LOCATION: resident-ui SONAR_URL: 'https://sonarcloud.io' @@ -66,7 +66,7 @@ jobs: ORG_KEY: ${{ secrets.ORG_KEY }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-uitest-resident: - uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-build.yml@master with: SERVICE_LOCATION: ./uitest-resident BUILD_ARTIFACT: uitest-resident From 56d83ea80561eabcd353b219fd0bf52b4c7bd874 Mon Sep 17 00:00:00 2001 From: Jayesh Kharode Date: Fri, 27 Sep 2024 13:53:45 +0530 Subject: [PATCH 4/4] MOSIP-33383 Signed-off-by: Jayesh Kharode --- .github/workflows/push-trigger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index fc7eee57..a375b6cb 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -66,7 +66,7 @@ jobs: ORG_KEY: ${{ secrets.ORG_KEY }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} build-maven-uitest-resident: - uses: mosip/kattu/.github/workflows/maven-build.yml@master + uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 with: SERVICE_LOCATION: ./uitest-resident BUILD_ARTIFACT: uitest-resident