diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bc1badf..4a50780f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: 1.18 + go-version: 1.21 - uses: actions/checkout@v4 - run: make build - uses: actions/upload-artifact@v4 @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: 1.18 + go-version: 1.21 - uses: actions/checkout@v4 - env: VIMEO_TEST_API_KEY: ${{ secrets.VIMEO_ACCESS_TOKEN }} @@ -51,9 +51,9 @@ jobs: steps: - uses: actions/setup-go@v5 - uses: actions/checkout@v4 - - uses: golangci/golangci-lint-action@v6 + - uses: golangci/golangci-lint-action@v8 with: - version: v1.57.2 + version: v2.2.2 - name: Go mod env: diff --git a/.golangci.yml b/.golangci.yml index fde0600a..cf13ff3e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,29 +1,20 @@ +version: "2" + +run: + timeout: 3m + linters: enable: - - structcheck - - varcheck - staticcheck - unconvert - - gofmt - - goimports - - golint + - revive # replacement for golint - ineffassign - - vet + - govet - unused - misspell - bodyclose - - interfacer - - unconvert - - maligned - # - depguard - nakedret - prealloc - whitespace disable: - errcheck - -run: - deadline: 3m - skip-dirs: - - bin - - docs diff --git a/pkg/builder/youtube.go b/pkg/builder/youtube.go index 528b384c..844ee58f 100644 --- a/pkg/builder/youtube.go +++ b/pkg/builder/youtube.go @@ -154,7 +154,7 @@ func (yt *YouTubeBuilder) GetVideoCount(ctx context.Context, info *model.Info) ( // Cost: 3 units if channel, err := yt.listChannels(ctx, info.LinkType, info.ItemID, "id,statistics"); err != nil { return 0, err - } else { // nolint:golint + } else { // nolint:revive return channel.Statistics.VideoCount, nil } @@ -162,7 +162,7 @@ func (yt *YouTubeBuilder) GetVideoCount(ctx context.Context, info *model.Info) ( // Cost: 3 units if playlist, err := yt.listPlaylists(ctx, info.ItemID, "", "id,contentDetails"); err != nil { return 0, err - } else { // nolint:golint + } else { // nolint:revive return uint64(playlist.ContentDetails.ItemCount), nil } @@ -199,7 +199,7 @@ func (yt *YouTubeBuilder) queryFeed(ctx context.Context, feed *model.Feed, info if date, err := yt.parseDate(channel.Snippet.PublishedAt); err != nil { return err - } else { // nolint:golint + } else { // nolint:revive feed.PubDate = date } @@ -222,7 +222,7 @@ func (yt *YouTubeBuilder) queryFeed(ctx context.Context, feed *model.Feed, info if date, err := yt.parseDate(playlist.Snippet.PublishedAt); err != nil { return err - } else { // nolint:golint + } else { // nolint:revive feed.PubDate = date }