From e6299c5ac3942b6f9a0c094637f8147d033c6617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 7 Feb 2024 10:37:50 +0000
Subject: [PATCH] CI: start testing on 1.22 now that it's released

---
 .github/workflows/test.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 00645cb..7ef6c58 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.21.x]
+        go-version: [1.21.x, 1.22.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -53,17 +53,17 @@ jobs:
     # Static checks from this point forward. Only run on one Go version and on
     # linux, since it's the fastest platform, and the tools behave the same.
     - name: Test third-party project builds
-      if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.21.x'
+      if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.22.x'
       run: |
         go install
         ./scripts/check-third-party.sh
-    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.21.x'
+    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.22.x'
       run: ./scripts/crlf-test.sh
-    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.21.x'
+    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.22.x'
       run: diff <(echo -n) <(gofmt -d .)
-    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.21.x'
+    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.22.x'
       run: go vet ./...
-    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.21.x'
+    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.22.x'
       uses: dominikh/staticcheck-action@v1
       with:
         version: "2023.1.6"
@@ -81,11 +81,12 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v4
       with:
-        go-version: 1.21.x
+        go-version: 1.22.x
         cache: false
     - run: go test -short ./...
 
   test-gotip:
+    if: false # let tip for 1.23 settle first
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4