From 94a9d866a2b7a363849fbcab420df23e34546a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <git@mislav.net>
Date: Tue, 9 Aug 2022 17:15:43 +0200
Subject: [PATCH 1/2] use Go 1.18 for linting

---
 .github/workflows/lint.yml | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 01c6ff0..80639a4 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,45 +1,27 @@
 name: Lint
 on: [push, pull_request]
+
 permissions:
   contents: read
+
 jobs:
-  go-mod:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        go: [1.16]
-    runs-on: ${{ matrix.os }}
+  lint:
+    runs-on: ubuntu-latest
 
     steps:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ${{ matrix.go }}
+          go-version: "1.18"
 
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Check go mod
+      - name: Check dependencies
         run: |
           go mod tidy
           git diff --exit-code go.mod
 
-  lint:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        go: [1.16]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ matrix.go }}
-
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
       - name: Lint
         uses: golangci/golangci-lint-action@v3.1.0
         with:

From d34553715ceeb13a2abcdfcca4a99bfd66216e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <git@mislav.net>
Date: Tue, 9 Aug 2022 22:53:46 +0200
Subject: [PATCH 2/2] Run tests with Go 1.18+

---
 .github/workflows/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 37bdea1..36c457c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,14 +1,17 @@
 name: Test
 on: [push, pull_request]
+
 permissions:
   contents: read
+
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        go: [1.16]
+        go: ["1.18", "1.19"]
+
     runs-on: ${{ matrix.os }}
 
     steps: