Merge pull request #298 from bestbeforetoday/schedule

Enable scheduled builds for release-2.5 branch

Author: mbwhite

.github/workflows/pull_request.yml

@@ -7,7 +7,6 @@ on:
   pull_request:
     branches:
       - main
-      - release-2.5
   workflow_dispatch:
 
 concurrency:

.github/workflows/push.yml

@@ -7,7 +7,6 @@ on:
   push:
     branches:
       - main
-      - release-2.5
   workflow_dispatch:
 
 jobs:

.github/workflows/release.yml

@@ -19,7 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        publish_target: ["publishAllPublicationsToGithubPackagesRepository","publishAllPublicationsToReleaseRepository"]
+        publish_target:
+          - publishAllPublicationsToGithubPackagesRepository
+          - publishAllPublicationsToReleaseRepository
     runs-on: ubuntu-latest
     needs: test
     steps:
@@ -30,7 +32,7 @@ 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
@@ -48,7 +50,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        DOCKER_REGISTRY: ["docker.io","ghcr.io"]
+        DOCKER_REGISTRY:
+          - 'docker.io'
+          - 'ghcr.io'
     runs-on: ubuntu-latest
     needs: test
     permissions:
@@ -62,15 +66,14 @@ 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: Build the depencies needed for the image
-        uses: gradle/gradle-build-action@v2.3.3
+        uses: gradle/gradle-build-action@v2
         with:
           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:
@@ -84,7 +87,6 @@ jobs:
           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

.github/workflows/schedule.yml

@@ -11,11 +11,9 @@ on:
 jobs:
   main:
     uses: ./.github/workflows/test.yml
-# Requires a test.yml to exist in the release-2.5 branch to implement the release-2.5 specific build/test steps, since
-# they are different from the main branch.
-#
-#  release-2_5:
-#    name: release-2.5
-#    uses: hyperledger/fabric-chaincode-java/.github/workflows/[email protected]
-#    with:
-#      checkout-ref: release-2.5
+
+  release-2_5:
+    name: release-2.5
+    uses: hyperledger/fabric-chaincode-java/.github/workflows/[email protected]
+    with:
+      checkout-ref: release-2.5

.github/workflows/test.yml

@@ -25,14 +25,14 @@ jobs:
         java-version: '11'
         cache: 'gradle'
     - name: Validate Gradle wrapper
-      uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
+      uses: gradle/wrapper-validation-action@v1
     - name: Dependency Check
-      uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+      uses: gradle/gradle-build-action@v2
       with:
         arguments: |
           :fabric-chaincode-shim:dependencyCheckAnalyze
     - name: Build and Unit test
-      uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+      uses: gradle/gradle-build-action@v2
       with:
         arguments: |
           :fabric-chaincode-shim:build 
@@ -69,7 +69,7 @@ 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