diff --git a/.github/workflows/go-cross.yml b/.github/workflows/go-cross.yml index cd7a79b..da46bb4 100644 --- a/.github/workflows/go-cross.yml +++ b/.github/workflows/go-cross.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: - go-version: [ 1.14, 1.15, 1.x ] + go-version: [ 1.15, 1.16, 1.x ] os: [ubuntu-latest, macos-latest, windows-latest] steps: @@ -29,11 +29,16 @@ jobs: - name: Cache Go modules uses: actions/cache@v2 with: + # In order: + # * Module download cache + # * Build cache (Linux) + # * Build cache (Mac) + # * Build cache (Windows) 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 + ~/.cache/go-build + ~/Library/Caches/go-build + %LocalAppData%\go-build key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-${{ matrix.go-version }}-go- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d8f798..dc5d2ca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,9 +14,9 @@ jobs: name: Main Process runs-on: ubuntu-latest env: - GO_VERSION: 1.15 - GOLANGCI_LINT_VERSION: v1.33.0 - SEIHON_VERSION: v0.5.1 + GO_VERSION: 1.16 + GOLANGCI_LINT_VERSION: v1.41.1 + SEIHON_VERSION: v0.8.3 CGO_ENABLED: 0 steps: @@ -47,7 +47,6 @@ jobs: go mod tidy git diff --exit-code go.mod git diff --exit-code go.sum - go mod download # https://golangci-lint.run/usage/install#other-ci - name: Install golangci-lint ${{ env.GOLANGCI_LINT_VERSION }} diff --git a/.golangci.toml b/.golangci.toml index 71f8582..3f14232 100644 --- a/.golangci.toml +++ b/.golangci.toml @@ -23,7 +23,10 @@ [linters] enable-all = true disable = [ - "maligned", + "golint", # deprecated + "scopelint", # deprecated + "interfacer", # deprecated + "maligned", # deprecated "lll", "gosec", "dupl", @@ -40,6 +43,7 @@ "wrapcheck", "exhaustive", "exhaustivestruct", + "forbidigo", ] [issues]