github/workflow: fix cache key (#100)

* github/workflow: fix on.{push,pull_request}.branch

* github/workflows: fix cache keys

Author: zchee

.codecov.yml

@@ -24,39 +24,39 @@ coverage:
       linux-1.13:
         <<: *projects
         flags:
-          - "linux-1.13"
+          - "linux-1.14"
       linux-1.14:
         <<: *projects
         flags:
-          - "linux-1.14"
+          - "linux-1.15"
       linux-1.15:
         <<: *projects
         flags:
-          - "linux-1.15"
+          - "linux-1.16"
       macos-1.13:
         <<: *projects
         flags:
-          - "macos-1.13"
+          - "macos-1.14"
       macos-1.14:
         <<: *projects
         flags:
-          - "macos-1.14"
+          - "macos-1.15"
       macos-1.15:
         <<: *projects
         flags:
-          - "macos-1.15"
+          - "macos-1.16"
       windows-1.13:
         <<: *projects
         flags:
-          - "windows-1.13"
+          - "windows-1.14"
       windows-1.14:
         <<: *projects
         flags:
-          - "windows-1.14"
+          - "windows-1.15"
       windows-1.15:
         <<: *projects
         flags:
-          - "windows-1.15"
+          - "windows-1.16"
     patch:
       default: false
       linux-1.13:
@@ -85,21 +85,17 @@ coverage:
         branches:
           - master
         flags:
-          - "linux-1.13"
           - "linux-1.14"
           - "linux-1.15"
-          - "macos-1.13"
+          - "linux-1.16"
           - "macos-1.14"
           - "macos-1.15"
-          - "windows-1.13"
+          - "macos-1.16"
           - "windows-1.14"
           - "windows-1.15"
+          - "windows-1.16"
 
 flags:
-  linux-1.13:
-    paths:
-      - /
-    carryforward: true
   linux-1.14:
     paths:
       - /
@@ -108,7 +104,7 @@ flags:
     paths:
       - /
     carryforward: true
-  macos-1.13:
+  linux-1.16:
     paths:
       - /
     carryforward: true
@@ -120,7 +116,7 @@ flags:
     paths:
       - /
     carryforward: true
-  windows-1.13:
+  macos-1.16:
     paths:
       - /
     carryforward: true
@@ -132,6 +128,10 @@ flags:
     paths:
       - /
     carryforward: true
+  windows-1.16:
+    paths:
+      - /
+    carryforward: true
 
 comment:
   behavior: default

.github/workflows/test.yml

@@ -3,19 +3,16 @@ name: Test
 on:
   push:
     branches:
-      - '**'
+      - master
   pull_request:
     branches:
-      - "*"
+      - master
   release:
     types:
       - published
       - created
       - edited
 
-env:
-  GO111MODULE: "on"
-
 defaults:
   run:
     shell: bash
@@ -25,9 +22,9 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-20.04  # https://github.com/actions/virtual-environments/blob/ubuntu20/20201210.0/images/linux/Ubuntu2004-README.md
-          - macos-10.15   # https://github.com/actions/virtual-environments/blob/macOS-10.15/20201212.1/images/macos/macos-10.15-Readme.md
-          - windows-2019  # https://github.com/actions/virtual-environments/blob/win19/20201210.0/images/win/Windows2019-Readme.md
+          - ubuntu-20.04  # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md
+          - macos-10.15   # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md
+          - windows-2019  # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md
         go-version:
           - 1.14.x
           - 1.15.x
@@ -56,36 +53,36 @@ jobs:
     - name: Cache Go module and build cache
       uses: actions/cache@v2
       with:
-        key: ${{ env.OS }}-go-${{ hashFiles('**/go.sum') }}
+        key: go-${{ env.OS }}-${{ hashFiles('**/go.mod') }}
         path: |
-          ~/go/pkg/mod              # Module download cache
-          ~/.cache/go-build         # Build cache (Linux)
-          ~/Library/Caches/go-build # Build cache (Mac)
-          '%LocalAppData%\go-build' # Build cache (Windows)
+          ~/go/pkg/mod               # Module download cache
+          ~/.cache/go-build          # Build cache (Linux)
+          ~/Library/Caches/go-build  # Build cache (Mac)
+          '%LocalAppData%\go-build'  # Build cache (Windows)
         restore-keys: |
-          ${{ env.OS }}-go-
+          go-${{ env.OS }}-
 
     - name: Cache nvim binary for linux and darwin
       id: cache-nvim
       uses: actions/cache@v2
       if: ${{ env.OS != 'windows' }}
       with:
-        key: ${{ env.OS }}-nvim-${{ hashFiles('~/nvim/bin/nvim') }}
+        key: nvim-${{ env.OS }}-${{ hashFiles('~/nvim/bin/nvim') }}
         path: |
           ~/nvim
         restore-keys: |
-          ${{ env.OS }}-nvim-
+          nvim-${{ env.OS }}-
 
     - name: Cache nvim binary for Windows
       id: cache-nvim-windows
       uses: actions/cache@v2
       if: ${{ env.OS == 'windows' }}
       with:
-        key: ${{ env.OS }}-nvim-${{ hashFiles('~/nvim/bin/nvim.exe') }}
+        key: nvim-${{ env.OS }}-${{ hashFiles('~/nvim/bin/nvim.exe') }}
         path: |
           ~/nvim
         restore-keys: |
-          ${{ env.OS }}-nvim-
+          nvim-${{ env.OS }}-
 
     - name: Install nvim binary
       uses: rhysd/action-setup-vim@v1