From 962b6c19a414339cae55d009ec309753a8e80872 Mon Sep 17 00:00:00 2001
From: Paul Tyng <paul@paultyng.net>
Date: Sun, 23 Oct 2022 09:31:39 -0400
Subject: [PATCH] Cleanup workflows, cache go

---
 .github/workflows/acctest.yml | 11 +++++------
 .github/workflows/ci.yaml     | 26 +++++++++++---------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/acctest.yml b/.github/workflows/acctest.yml
index e21b76d..5706db6 100644
--- a/.github/workflows/acctest.yml
+++ b/.github/workflows/acctest.yml
@@ -28,13 +28,12 @@ jobs:
           - "1.2.9"
           - "1.3.3"
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+          go-version-file: "go.mod"
+          cache: true
+          check-latest: true
 
       - run: make testacc-up UNIFI_VERSION=${{ matrix.unifi_version }}
 
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index efb2991..32433af 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -7,31 +7,27 @@ on:
     tags:
       - "v*"
 
-env:
-  GO_VERSION: "1.19"
-
 jobs:
   build:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v3"
-      - uses: "actions/cache@v3.0.11"
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
         with:
-          path: "~/go/pkg/mod"
-          key: "${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}"
-          restore-keys: |
-            ${{ runner.os }}-gomod-
+          go-version-file: "go.mod"
+          cache: true
+          check-latest: true
 
-      - uses: "actions/setup-go@v3"
-        with:
-          go-version: "${{ env.GO_VERSION }}"
       - run: "go build ./..."
 
   lint:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v3"
-      - uses: "actions/setup-go@v3"
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
         with:
-          go-version: "${{ env.GO_VERSION }}"
+          go-version-file: "go.mod"
+          cache: true
+          check-latest: true
+
       - uses: "golangci/golangci-lint-action@v3.2.0"