Refactor of GitHub Actions workflows for consistency with main

Allows the scheduled build defined in main branch to run the tests in this branch using the test.yml workflow.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

Author: bestbeforetoday

.github/workflows/pr.yml

@@ -0,0 +1,25 @@
+# Copyright the Hyperledger Fabric contributors. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+name: Pull request
+
+on:
+  pull_request:
+    branches:
+      - release-2.5
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    uses: ./.github/workflows/test.yml
+
+  pull-request:
+    needs: test
+    name: Pull request success
+    runs-on: ubuntu-latest
+    steps:
+      - run: true

.github/workflows/pull_request.yml

@@ -0,0 +1,14 @@
+# Copyright the Hyperledger Fabric contributors. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+name: Push
+
+on:
+  push:
+    branches:
+      - release-2.5
+  workflow_dispatch:
+
+jobs:
+  test:
+    uses: ./.github/workflows/test.yml

.github/workflows/push.yml

@@ -2,32 +2,28 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+name: Release
 
-# Workflow will only run on tag creation. It will run the integration tests first to confirm that the build is sound and then
-# and only then do the publishing
-name: Publish Workflow
 on:
   create:
     tags:
-      - "*"  
+      - '*'
   workflow_dispatch:
-    
+
 jobs:
-   
-  # Run the integration tests on the repo, before moving to the publishing.
-  # Run the integration tests on the repo
-  publish_call_intergationtest:
-    uses: ./.github/workflows/integrationtest.yml
+  test:
+    uses: ./.github/workflows/test.yaml
 
-  
   # Publishing steps to both the Github Packages and the Sonatype
   publishjars:
     strategy:
       fail-fast: false
       matrix:
-        publish_target: ["publishAllPublicationsToGithubPackagesRepository","publishAllPublicationsToReleaseRepository"]
+        publish_target:
+          - publishAllPublicationsToGithubPackagesRepository
+          - publishAllPublicationsToReleaseRepository
     runs-on: ubuntu-latest
-    needs: [publish_call_intergationtest]
+    needs: test
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
@@ -36,12 +32,12 @@ jobs:
           java-version: '11'
           cache: 'gradle'
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1.0.5
+        uses: gradle/wrapper-validation-action@v1
       - name: Push to registry ${{ matrix.publish_target }}
         run: |
           set -xev
           ./gradlew -Psigning.key="${SIGNING_KEY}" -Psigning.password="${SIGNING_PASSWORD}" -PossrhUsername="${OSSRH_USER}" -PossrhPassword="${OSSRH_PASSWORD}" ${TARGET}
-        env:          
+        env:
           SIGNING_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
           SIGNING_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
           OSSRH_USER: ${{ secrets.OSSRH_USERNAME }}
@@ -54,9 +50,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DOCKER_REGISTRY: ["docker.io","ghcr.io"]
+        DOCKER_REGISTRY:
+          - 'docker.io'
+          - 'ghcr.io'
     runs-on: ubuntu-latest
-    needs: [publish_call_intergationtest]
+    needs: test
     permissions:
       contents: read
       packages: write
@@ -68,31 +66,27 @@ jobs:
           java-version: '11'
           cache: 'gradle'
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1.0.5
-      - name: Build the depencies needed for the image
-        uses: gradle/gradle-build-action@v2.3.3
+        uses: gradle/wrapper-validation-action@v1
+      - name: Build the dependencies needed for the image
+        uses: gradle/gradle-build-action@v2
         with:
-            arguments: |          
-               :fabric-chaincode-docker:copyAllDeps -x dependencyCheckAnalyze
-
+          arguments: |
+            :fabric-chaincode-docker:copyAllDeps -x dependencyCheckAnalyze
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         with:
           buildkitd-flags: --debug
           config-inline: |
             [worker.oci]
               max-parallelism = 1
-
       - name: Login to the ${{ matrix.DOCKER_REGISTRY }} Container Registry
         uses: docker/login-action@v2
         with:
           registry: ${{ matrix.DOCKER_REGISTRY }}
           username: ${{ matrix.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_USERNAME || github.actor }}
           password: ${{ matrix.DOCKER_REGISTRY == 'docker.io' && secrets.DOCKERHUB_TOKEN    || secrets.GITHUB_TOKEN }}
-
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -112,4 +106,3 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           push: ${{ github.event_name != 'pull_request' }}
           labels: ${{ steps.meta.outputs.labels }}
-

.github/workflows/publish.yml .github/workflows/release.yml.github/workflows/publish.yml renamed to .github/workflows/release.yml

@@ -2,30 +2,60 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-name: Reusable Integration Test workflow
+name: Test
 
 on:
   workflow_call:
+    inputs:
+      checkout-ref:
+        default: ''
+        required: false
+        type: string
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{ inputs.checkout-ref }}
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '11'
+        cache: 'gradle'
+    - name: Validate Gradle wrapper
+      uses: gradle/wrapper-validation-action@v1
+    - name: Dependency Check
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: |
+          :fabric-chaincode-shim:dependencyCheckAnalyze
+    - name: Build and Unit test
+      uses: gradle/gradle-build-action@v2
+      with:
+        arguments: |
+          :fabric-chaincode-shim:build 
+          -xdependencyCheckAnalyze            
+    
   intergationtest:  
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.checkout-ref }}
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
           cache: 'gradle'
-
       - name: Populate chaincode with latest java-version
         run: |
           ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/repository publishShimPublicationToFabricRepository
           ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/repository publishShimPublicationToFabricRepository
           ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-gradle/repository publishShimPublicationToFabricRepository
           ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/bare-maven/repository publishShimPublicationToFabricRepository
           ./gradlew -I $GITHUB_WORKSPACE/fabric-chaincode-integration-test/chaincodebootstrap.gradle -PchaincodeRepoDir=$GITHUB_WORKSPACE/fabric-chaincode-integration-test/src/contracts/wrapper-maven/repository publishShimPublicationToFabricRepository
-
       - name: Ensure that the Peer/weft tools are available
         run: |
           curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary
@@ -39,8 +69,8 @@ jobs:
           peer version
           weft --version
       - name: Integration Tests
-        uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+        uses: gradle/gradle-build-action@v2
         with:
           arguments: |
             :fabric-chaincode-integration-test:build 
-            -xdependencyCheckAnalyze 
+            -xdependencyCheckAnalyze