From 3c4a23abd7a8ed371608fb60c622ba971d37e283 Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Sat, 4 Mar 2023 20:40:23 -0500
Subject: [PATCH 1/2] Shift tested Go versions in v2-maint

as with #1691
---
 .github/workflows/cli.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index 9c9707df90..b2e4568b0b 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        go: [1.18.x, 1.19.x]
+        go: [1.20.x, 1.20.x]
     name: ${{ matrix.os }} @ Go ${{ matrix.go }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -25,9 +25,9 @@ jobs:
       - name: Set PATH
         run: echo "${GITHUB_WORKSPACE}/.local/bin" >>"${GITHUB_PATH}"
       - uses: actions/checkout@v3
-      - if: matrix.go == '1.19.x' && matrix.os == 'ubuntu-latest'
+      - if: matrix.go == '1.20.x' && matrix.os == 'ubuntu-latest'
         run: make ensure-goimports
-      - if: matrix.go == '1.19.x' && matrix.os == 'ubuntu-latest'
+      - if: matrix.go == '1.20.x' && matrix.os == 'ubuntu-latest'
         run: make lint
       - run: make vet
       - run: make test
@@ -40,12 +40,12 @@ jobs:
           GFLAGS: -tags urfave_cli_no_docs
       - run: make check-binary-size
       - run: make yamlfmt
-      - if: matrix.go == '1.19.x' && matrix.os == 'ubuntu-latest'
+      - if: matrix.go == '1.20.x' && matrix.os == 'ubuntu-latest'
         run: make generate
       - run: make diffcheck
-      - if: matrix.go == '1.19.x' && matrix.os == 'ubuntu-latest'
+      - if: matrix.go == '1.20.x' && matrix.os == 'ubuntu-latest'
         run: make v2diff
-      - if: success() && matrix.go == '1.19.x' && matrix.os == 'ubuntu-latest'
+      - if: success() && matrix.go == '1.20.x' && matrix.os == 'ubuntu-latest'
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -56,7 +56,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.20.x
       - uses: actions/setup-node@v3
         with:
           node-version: '16'

From 7ebe2d5d54be6edded234451458f3d61a4b37643 Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Sat, 4 Mar 2023 20:44:32 -0500
Subject: [PATCH 2/2] Un-substitute a string whoops

---
 .github/workflows/cli.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index b2e4568b0b..74afea8750 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        go: [1.20.x, 1.20.x]
+        go: [1.19.x, 1.20.x]
     name: ${{ matrix.os }} @ Go ${{ matrix.go }}
     runs-on: ${{ matrix.os }}
     steps: