From 5578f2009c61ace0d507ea0dd03b770f13cc16b8 Mon Sep 17 00:00:00 2001
From: Joshua Goldstein <jgoldstein345@gmail.com>
Date: Wed, 14 Dec 2022 23:41:54 -0600
Subject: [PATCH 1/2] pull in changes from main

---
 .github/workflows/cd-badger-amd64.yml         | 44 +++++++++++++++++++
 .github/workflows/cd-badger-arm64.yml         | 44 +++++++++++++++++++
 .../ci-badger-bank-tests-nightly.yml          |  2 +-
 .github/workflows/ci-badger-bank-tests.yml    |  2 +-
 .github/workflows/ci-badger-tests.yml         |  2 +-
 .github/workflows/ci-golang-lint.yml          |  2 +-
 6 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/cd-badger-amd64.yml
 create mode 100644 .github/workflows/cd-badger-arm64.yml

diff --git a/.github/workflows/cd-badger-amd64.yml b/.github/workflows/cd-badger-amd64.yml
new file mode 100644
index 000000000..4ce71e712
--- /dev/null
+++ b/.github/workflows/cd-badger-amd64.yml
@@ -0,0 +1,44 @@
+name: cd-badger-amd64
+on: workflow_dispatch
+jobs:
+  badger-build:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Get Go Version
+        run: |
+          #!/bin/bash
+          GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
+          echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GOVERSION }}
+      - name: Set Badger Release Version
+        run: |
+          #!/bin/bash
+          GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+          if [[ "$GIT_BRANCH_NAME" == "release/v"* ]]; 
+          then
+            echo "this is a release branch"
+          else
+            echo "this is NOT a release branch"
+            exit 1
+          fi
+          BADGER_RELEASE_VERSION=$(git rev-parse --abbrev-ref HEAD | sed  's/release\///')
+          echo "making a new release for "$BADGER_RELEASE_VERSION
+          echo "BADGER_RELEASE_VERSION=$BADGER_RELEASE_VERSION" >> $GITHUB_ENV
+      - name: Fetch dependencies
+        run: sudo apt-get -y install build-essential
+      - name: Build badger linux/amd64
+        run: make badger
+      - name: Generate SHA for Linux Build
+        run: cd badger && sha256sum badger-linux-amd64 | cut -c-64 > badger-checksum-linux-amd64.sha256
+      - name: Tar Archive for Linux Build
+        run: cd badger && tar -zcvf badger-linux-amd64.tar.gz badger-linux-amd64
+      - name: Upload Badger Binary Build Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          path: |
+            badger/badger-checksum-linux-amd64.sha256
+            badger/badger-linux-amd64.tar.gz
diff --git a/.github/workflows/cd-badger-arm64.yml b/.github/workflows/cd-badger-arm64.yml
new file mode 100644
index 000000000..677472fac
--- /dev/null
+++ b/.github/workflows/cd-badger-arm64.yml
@@ -0,0 +1,44 @@
+name: cd-badger-arm64
+on: workflow_dispatch
+jobs:
+  badger-build:
+    runs-on: [self-hosted, ARM64]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Get Go Version
+        run: |
+          #!/bin/bash
+          GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
+          echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GOVERSION }}
+      - name: Set Badger Release Version
+        run: |
+          #!/bin/bash
+          GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+          if [[ "$GIT_BRANCH_NAME" == "release/v"* ]]; 
+          then
+            echo "this is a release branch"
+          else
+            echo "this is NOT a release branch"
+            exit 1
+          fi
+          BADGER_RELEASE_VERSION=$(git rev-parse --abbrev-ref HEAD | sed  's/release\///')
+          echo "making a new release for "$BADGER_RELEASE_VERSION
+          echo "BADGER_RELEASE_VERSION=$BADGER_RELEASE_VERSION" >> $GITHUB_ENV
+      - name: Fetch dependencies
+        run: sudo apt-get -y install build-essential
+      - name: Build badger linux/arm64
+        run: make badger
+      - name: Generate SHA for Linux Build
+        run: cd badger && sha256sum badger-linux-arm64 | cut -c-64 > badger-checksum-linux-arm64.sha256
+      - name: Tar Archive for Linux Build
+        run: cd badger && tar -zcvf badger-linux-arm64.tar.gz badger-linux-arm64
+      - name: Upload Badger Binary Build Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          path: |
+            badger/badger-checksum-linux-arm64.sha256
+            badger/badger-linux-arm64.tar.gz
diff --git a/.github/workflows/ci-badger-bank-tests-nightly.yml b/.github/workflows/ci-badger-bank-tests-nightly.yml
index 513defa01..8e0702766 100644
--- a/.github/workflows/ci-badger-bank-tests-nightly.yml
+++ b/.github/workflows/ci-badger-bank-tests-nightly.yml
@@ -8,7 +8,7 @@ on:
     - cron: "0 3 * * *"
 jobs:
   badger-bank:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Get Go Version
diff --git a/.github/workflows/ci-badger-bank-tests.yml b/.github/workflows/ci-badger-bank-tests.yml
index c25f2a366..8cef24373 100644
--- a/.github/workflows/ci-badger-bank-tests.yml
+++ b/.github/workflows/ci-badger-bank-tests.yml
@@ -12,7 +12,7 @@ on:
     - cron: "*/30 * * * *"
 jobs:
   badger-bank:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Get Go Version
diff --git a/.github/workflows/ci-badger-tests.yml b/.github/workflows/ci-badger-tests.yml
index e300547aa..45c585093 100644
--- a/.github/workflows/ci-badger-tests.yml
+++ b/.github/workflows/ci-badger-tests.yml
@@ -12,7 +12,7 @@ on:
     - cron: "*/30 * * * *"
 jobs:
   badger-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Get Go Version
diff --git a/.github/workflows/ci-golang-lint.yml b/.github/workflows/ci-golang-lint.yml
index 1f30eea94..b132e7ff9 100644
--- a/.github/workflows/ci-golang-lint.yml
+++ b/.github/workflows/ci-golang-lint.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   go-lint:
     name: lint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Get Go Version

From c0edbb836824f78b565fe7aff69270adeb236c9c Mon Sep 17 00:00:00 2001
From: Joshua Goldstein <jgoldstein345@gmail.com>
Date: Thu, 15 Dec 2022 15:38:51 -0600
Subject: [PATCH 2/2] unify workflows

---
 .github/workflows/cd-badger-amd64.yml | 44 --------------------------
 .github/workflows/cd-badger-arm64.yml | 44 --------------------------
 .github/workflows/cd-badger.yml       | 45 +++++++++++++++++++++++++--
 3 files changed, 43 insertions(+), 90 deletions(-)
 delete mode 100644 .github/workflows/cd-badger-amd64.yml
 delete mode 100644 .github/workflows/cd-badger-arm64.yml

diff --git a/.github/workflows/cd-badger-amd64.yml b/.github/workflows/cd-badger-amd64.yml
deleted file mode 100644
index 4ce71e712..000000000
--- a/.github/workflows/cd-badger-amd64.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: cd-badger-amd64
-on: workflow_dispatch
-jobs:
-  badger-build:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Get Go Version
-        run: |
-          #!/bin/bash
-          GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
-          echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ env.GOVERSION }}
-      - name: Set Badger Release Version
-        run: |
-          #!/bin/bash
-          GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
-          if [[ "$GIT_BRANCH_NAME" == "release/v"* ]]; 
-          then
-            echo "this is a release branch"
-          else
-            echo "this is NOT a release branch"
-            exit 1
-          fi
-          BADGER_RELEASE_VERSION=$(git rev-parse --abbrev-ref HEAD | sed  's/release\///')
-          echo "making a new release for "$BADGER_RELEASE_VERSION
-          echo "BADGER_RELEASE_VERSION=$BADGER_RELEASE_VERSION" >> $GITHUB_ENV
-      - name: Fetch dependencies
-        run: sudo apt-get -y install build-essential
-      - name: Build badger linux/amd64
-        run: make badger
-      - name: Generate SHA for Linux Build
-        run: cd badger && sha256sum badger-linux-amd64 | cut -c-64 > badger-checksum-linux-amd64.sha256
-      - name: Tar Archive for Linux Build
-        run: cd badger && tar -zcvf badger-linux-amd64.tar.gz badger-linux-amd64
-      - name: Upload Badger Binary Build Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          path: |
-            badger/badger-checksum-linux-amd64.sha256
-            badger/badger-linux-amd64.tar.gz
diff --git a/.github/workflows/cd-badger-arm64.yml b/.github/workflows/cd-badger-arm64.yml
deleted file mode 100644
index 677472fac..000000000
--- a/.github/workflows/cd-badger-arm64.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: cd-badger-arm64
-on: workflow_dispatch
-jobs:
-  badger-build:
-    runs-on: [self-hosted, ARM64]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Get Go Version
-        run: |
-          #!/bin/bash
-          GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
-          echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ env.GOVERSION }}
-      - name: Set Badger Release Version
-        run: |
-          #!/bin/bash
-          GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
-          if [[ "$GIT_BRANCH_NAME" == "release/v"* ]]; 
-          then
-            echo "this is a release branch"
-          else
-            echo "this is NOT a release branch"
-            exit 1
-          fi
-          BADGER_RELEASE_VERSION=$(git rev-parse --abbrev-ref HEAD | sed  's/release\///')
-          echo "making a new release for "$BADGER_RELEASE_VERSION
-          echo "BADGER_RELEASE_VERSION=$BADGER_RELEASE_VERSION" >> $GITHUB_ENV
-      - name: Fetch dependencies
-        run: sudo apt-get -y install build-essential
-      - name: Build badger linux/arm64
-        run: make badger
-      - name: Generate SHA for Linux Build
-        run: cd badger && sha256sum badger-linux-arm64 | cut -c-64 > badger-checksum-linux-arm64.sha256
-      - name: Tar Archive for Linux Build
-        run: cd badger && tar -zcvf badger-linux-arm64.tar.gz badger-linux-arm64
-      - name: Upload Badger Binary Build Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          path: |
-            badger/badger-checksum-linux-arm64.sha256
-            badger/badger-linux-arm64.tar.gz
diff --git a/.github/workflows/cd-badger.yml b/.github/workflows/cd-badger.yml
index d66ad08c9..36b392c85 100644
--- a/.github/workflows/cd-badger.yml
+++ b/.github/workflows/cd-badger.yml
@@ -1,8 +1,8 @@
 name: cd-badger
 on: workflow_dispatch
 jobs:
-  badger-build:
-    runs-on: ubuntu-latest
+  badger-build-amd64:
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - name: Get Go Version
@@ -42,3 +42,44 @@ jobs:
           path: |
             badger/badger-checksum-linux-amd64.sha256
             badger/badger-linux-amd64.tar.gz
+  badger-build-arm64:
+    runs-on: [self-hosted, ARM64]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Get Go Version
+        run: |
+          #!/bin/bash
+          GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
+          echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GOVERSION }}
+      - name: Set Badger Release Version
+        run: |
+          #!/bin/bash
+          GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+          if [[ "$GIT_BRANCH_NAME" == "release/v"* ]]; 
+          then
+            echo "this is a release branch"
+          else
+            echo "this is NOT a release branch"
+            exit 1
+          fi
+          BADGER_RELEASE_VERSION=$(git rev-parse --abbrev-ref HEAD | sed  's/release\///')
+          echo "making a new release for "$BADGER_RELEASE_VERSION
+          echo "BADGER_RELEASE_VERSION=$BADGER_RELEASE_VERSION" >> $GITHUB_ENV
+      - name: Fetch dependencies
+        run: sudo apt-get -y install build-essential
+      - name: Build badger linux/arm64
+        run: make badger
+      - name: Generate SHA for Linux Build
+        run: cd badger && sha256sum badger-linux-arm64 | cut -c-64 > badger-checksum-linux-arm64.sha256
+      - name: Tar Archive for Linux Build
+        run: cd badger && tar -zcvf badger-linux-arm64.tar.gz badger-linux-arm64
+      - name: Upload Badger Binary Build Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          path: |
+            badger/badger-checksum-linux-arm64.sha256
+            badger/badger-linux-arm64.tar.gz