From c2dd07958424b20871f270affa867f08348e9134 Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Sun, 26 Jan 2020 19:56:40 +0000
Subject: [PATCH] update github actions config

- combine windows and linux configs into a single matrix, now that
  actions/cache handles file paths properly
- update to latest actions/checkout and codecov actions
---
 .github/workflows/tests.yml | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ed424aa..3f1e1c5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,55 +8,34 @@ jobs:
     strategy:
       matrix:
         go-version: [1.12.x, 1.13.x]
-        platform: [ubuntu-latest]
+        platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
 
     steps:
     - uses: actions/setup-go@v1
       with:
         go-version: ${{ matrix.go-version }}
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     - name: Cache go modules
-      uses: actions/cache@preview
+      uses: actions/cache@v1.1.0
       with:
         path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        key: ${{ runner.os }}-go-${{ hashFiles('go.sum') }}
         restore-keys: |
           ${{ runner.os }}-go-
 
     - name: Run go fmt
+      if: runner.os != 'Windows'
       run: diff -u <(echo -n) <(gofmt -d -s .)
 
     - name: Run go vet
       run: go vet ./...
 
     - name: Run go test
-      run: go test -v -race -coverprofile=coverage.txt -covermode=atomic ./...
+      run: go test -v -race -coverprofile coverage.txt -covermode atomic ./...
 
     - name: Upload coverage to Codecov
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      run: bash <(curl -s https://codecov.io/bash)
-
-  # On Windows, just run the local tests.  Don't bother with checking gofmt, go
-  # vet, or uploading results to Codecov
-  test-windows:
-    strategy:
-      matrix:
-        go-version: [1.12.x, 1.13.x]
-        platform: [windows-latest]
-    runs-on: ${{ matrix.platform }}
-    steps:
-    - uses: actions/setup-go@v1
+      uses: codecov/codecov-action@v1
       with:
-        go-version: ${{ matrix.go-version }}
-    - uses: actions/checkout@v1
-    - name: Cache go modules
-      uses: actions/cache@preview
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**\go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
-    - run: go test ./...
+        token: ${{ secrets.CODECOV_TOKEN }}