Use callable workflow from release-2.2 branch in scheduled builds

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
hyperledger · Jan 12, 2023 · 413eb83 · 413eb83
1 parent 11561d8
commit 413eb83
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml
@@ -3,7 +3,15 @@ name: Scheduled build
 on:
   schedule:
     - cron: "5 0 * * *"
+  pull_request:
+    branches:
+      - main
 
 jobs:
   main:
     uses: ./.github/workflows/test.yml
+  release-2_2:
+    name: release-2.2
+    uses: hyperledger/fabric-sdk-java/.github/workflows/test.yml@release-2.2
+    with:
+      checkout-ref: release-2.2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/scripts/pull-fabric-images.sh b/scripts/pull-fabric-images.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 set -euo pipefail
 
-# FABRIC_VERSION is set overridden by CI pipeline
+# FABRIC_VERSION is overridden by CI pipeline
 VERSION=${FABRIC_VERSION:-2.2}
 STABLE_TAG=amd64-${VERSION}-stable