TASK-4464

.github/workflows/build-java-app-workflow.yml

@@ -15,7 +15,6 @@ jobs:
   build-workflow:
     name: Build Java app
     runs-on: ubuntu-22.04
-    #runs-on: self-hosted
     outputs:
       version: ${{ steps.get_project_version.outputs.version }}
     steps:
@@ -41,10 +40,8 @@ jobs:
           name: build-folder
           path: build
       - id: get_project_version
-        uses: avides/actions-project-version-check@v1.3.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          file-to-check: pom.xml
-          only-return-version: true
+        name: Get project version
+        run: |
+          echo "version=`mvn help:evaluate -q -Dexpression=project.version -DforceStdout`" >> $GITHUB_OUTPUT
       - name: test-version-from-check
         run: echo "Project version is " ${{ steps.get_project_version.outputs.version }}

.github/workflows/deploy-python-workflow.yml

@@ -30,4 +30,4 @@ jobs:
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_TWINE_USER }}
           TWINE_PASSWORD: ${{ secrets.PYPI_TWINE_PASSWORD }}
-        run: ${{ inputs.cli }}
+        run: ${{ inputs.cli }}

.github/workflows/develop.yml

@@ -1,4 +1,4 @@
-name: Push java-common-libs develop
+name: Merge/Push in java-common-libs develop branch
 
 on:
   push:
@@ -14,9 +14,6 @@ jobs:
     uses: ./.github/workflows/test-analysis.yml
     needs: build
     secrets: inherit
-    with:
-      report_context: development
-      report_dir: ${{ github.ref_name }}/java-common-libs/${{ github.sha }}
 
   deploy-maven:
     uses: ./.github/workflows/deploy-maven-repository-workflow.yml

.github/workflows/release.yml

@@ -9,14 +9,6 @@ jobs:
   build:
     uses: ./.github/workflows/build-java-app-workflow.yml
 
-  test:
-    uses: ./.github/workflows/test-analysis.yml
-    needs: build
-    secrets: inherit
-    with:
-      report_context: xetabase
-      report_dir: java-common-libs
-
   deploy-maven:
     uses: ./.github/workflows/deploy-maven-repository-workflow.yml
     needs: test

.github/workflows/task.yml

@@ -1,4 +1,4 @@
-name: Push java-common-libs task
+name: Push in java-common-libs task branch
 
 on:
   push:
@@ -13,6 +13,3 @@ jobs:
     uses: ./.github/workflows/test-analysis.yml
     needs: build
     secrets: inherit
-    with:
-      report_context: development
-      report_dir: ${{ github.ref_name }}/java-common-libs/${{ github.sha }}

.github/workflows/test-analysis.yml

@@ -1,26 +1,11 @@
 name: Build and test the project
+
 on:
   workflow_call:
     secrets:
       SONAR_TOKEN:
         required: true
-      SSH_TESTING_SERVER_HOST:
-        required: true
-      SSH_TESTING_SERVER_PORT:
-        required: true
-      SSH_TESTING_SERVER_USER:
-        required: true
-      SSH_TESTING_SERVER_PASSWORD:
-        required: true
-    inputs:
-      report_dir:
-        type: string
-        required: true
-      report_context:
-        type: string
-        required: true
-env:
-  xb_version: "1.8.0"
+
 jobs:
   test:
     name: Test and push Sonar analysis
@@ -44,31 +29,14 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify surefire-report:report org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=opencb_java-common-libs
-      - name: Upload result dir
-        uses: actions/upload-artifact@v3
-        with:
-          name: workdir
-          path: "**/target/site"
-  publish-test:
-    name: Publish test results
-    runs-on: ubuntu-22.04
-    needs: test
-    strategy:
-      matrix:
-        module: ["commons-lib", "commons-datastore", "commons-datastore/commons-datastore-core", "commons-datastore/commons-datastore-mongodb", "commons-datastore/commons-datastore-solr"]
-    steps:
-      - name: Download result dir
-        uses: actions/download-artifact@v3
-        with:
-          name: workdir
-      - name: Deploy unit tests web recursively to remote
-        uses: garygrossgarten/github-action-scp@release
+        run: mvn -B verify surefire-report:report --fail-never org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=opencb_java-common-libs
+      - name: Publish Test Report
+        uses: scacap/action-surefire-report@v1
+        ## Skip cancelled()
+        ## https://docs.github.com/en/actions/learn-github-actions/expressions#cancelled
+        if: success() || failure()
         with:
-          local: ${{ matrix.module }}/target/site
-          remote: /var/www/html/reports/${{ inputs.report_context }}/${{ env.xb_version }}/${{ inputs.report_dir }}/unit/${{ matrix.module }}
-          host: ${{ secrets.SSH_TESTING_SERVER_HOST}}
-          port: ${{ secrets.SSH_TESTING_SERVER_PORT}}
-          username: ${{ secrets.SSH_TESTING_SERVER_USER }}
-          password: ${{ secrets.SSH_TESTING_SERVER_PASSWORD }}
-          concurrency: 2
+          check_name: "Surefire tests report"
+          report_paths: './**/surefire-reports/TEST-*.xml'
+          commit: '${{ github.sha }}'
+          fail_on_test_failures: true