diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f8011ad..48448735 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,7 +141,7 @@ jobs: name: lint runs-on: ubuntu-latest env: - GOLANGCI_LINT_VERSION: v1.55.2 + GOLANGCI_LINT_VERSION: v1.56 permissions: contents: read # allow read access to pull request. Use with `only-new-issues` option. @@ -157,31 +157,31 @@ jobs: uses: actions/checkout@v4 - name: Lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v4 with: version: ${{ env.GOLANGCI_LINT_VERSION }} working-directory: . - name: Lint cmd/river - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v4 with: version: ${{ env.GOLANGCI_LINT_VERSION }} working-directory: ./cmd/river - name: Lint riverdriver - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v4 with: version: ${{ env.GOLANGCI_LINT_VERSION }} working-directory: ./riverdriver - name: Lint riverdriver/riverdatabasesql - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v4 with: version: ${{ env.GOLANGCI_LINT_VERSION }} working-directory: ./riverdriver/riverdatabasesql - name: Lint riverdriver/riverpgxv5 - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v4 with: version: ${{ env.GOLANGCI_LINT_VERSION }} working-directory: ./riverdriver/riverpgxv5 diff --git a/internal/rivercommon/test_signal_test.go b/internal/rivercommon/test_signal_test.go index 898452da..ff0dd1a0 100644 --- a/internal/rivercommon/test_signal_test.go +++ b/internal/rivercommon/test_signal_test.go @@ -44,7 +44,7 @@ func TestTestSignal(t *testing.T) { } // Marked as non-parallel because `t.Setenv` is not compatible with `t.Parallel`. -func TestWaitTimeout(t *testing.T) { //nolint:paralleltest +func TestWaitTimeout(t *testing.T) { t.Setenv("GITHUB_ACTIONS", "") require.Equal(t, 3*time.Second, WaitTimeout())