From df9c661a192f8cf11376d9d643a0021f1a76c34b Mon Sep 17 00:00:00 2001
From: David Enyeart <enyeart@us.ibm.com>
Date: Wed, 26 Oct 2022 11:24:22 -0400
Subject: [PATCH] Revert back to ubuntu-20.04

ubuntu-22.04 caused issues with the binaries, revert back to ubuntu-20.04.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
(cherry picked from commit e8c6102cc38d835dd6f3efe7b90a2f1133d21a68)
---
 .github/workflows/release.yml      | 10 +++++-----
 .github/workflows/verify-build.yml |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 12416e533f0..58944c5deb6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         include:
-        - image: ubuntu-22.04
+        - image: ubuntu-20.04
           target: linux
           arch: amd64
         - image: macos-11
@@ -36,7 +36,7 @@ jobs:
         - image: windows-2022
           target: windows
           arch: amd64
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Install Go
         uses: actions/setup-go@v3
@@ -56,7 +56,7 @@ jobs:
           path: release/${{ matrix.target }}-${{ matrix.arch }}/hyperledger-fabric-${{ matrix.target }}-${{ matrix.arch }}-${{ inputs.release }}.tar.gz
   build-and-push-docker-images:
     name: Build and Push Fabric Docker Images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Run APT Clean
         run: sudo apt clean
@@ -80,7 +80,7 @@ jobs:
   create-release:
     name: Create GitHub Release
     needs: [ build-binaries, build-and-push-docker-images ]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     permissions:
       contents: write
     steps:
@@ -95,4 +95,4 @@ jobs:
           artifacts: "*.tar.gz/*.tar.gz"
           bodyFile: release_notes/v${{ inputs.release }}.md
           tag: v${{ inputs.release }}
-          token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
index 4c4f3815d73..e03c49fab09 100644
--- a/.github/workflows/verify-build.yml
+++ b/.github/workflows/verify-build.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   basic-checks:
     name: Basic Checks
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/setup-go@v3
         name: Install Go
@@ -31,7 +31,7 @@ jobs:
   unit-tests:
     name: Unit Tests
     needs: basic-checks
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/setup-go@v3
         name: Install Go
@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         INTEGRATION_TEST_SUITE: ["raft","pvtdata","ledger","lifecycle","e2e","discovery gossip devmode pluggable","gateway idemix pkcs11 configtx configtxlator","sbe nwo msp"]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/setup-go@v3
         name: Install Go