diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index f3f967eb669d..e46b77a06362 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -88,7 +88,6 @@ jobs: - run: ./golangci-lint config - run: ./golangci-lint config path - run: ./golangci-lint config path --json - # TODO(ldez) after v2: golangci.next.jsonschema.json -> golangci.jsonschema.json - run: ./golangci-lint config verify --schema jsonschema/golangci.next.jsonschema.json - run: ./golangci-lint help diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml index 3393ae3bc1ee..380472037050 100644 --- a/.github/workflows/pr-tests.yml +++ b/.github/workflows/pr-tests.yml @@ -40,11 +40,10 @@ jobs: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 go-version: ${{ env.GO_VERSION }} - # TODO(ldez): must add uncommented when golangci-lint-action@v7.0.0 (with golangci-lint v2 support) will be created. -# - name: lint -# uses: golangci/golangci-lint-action@v6.5.0 -# with: -# version: latest + - name: lint + uses: golangci/golangci-lint-action@v7.0.0 + with: + version: latest tests-on-windows: needs: golangci-lint # run after golangci-lint action to not produce duplicated errors diff --git a/assets/github-action-config-v2.json b/assets/github-action-config-v2.json index bbcfdfbc30b9..2f3d958d2540 100644 --- a/assets/github-action-config-v2.json +++ b/assets/github-action-config-v2.json @@ -1,7 +1,7 @@ { "MinorVersionToConfig": { "latest": { - "TargetVersion": "v2.0.0" + "TargetVersion": "v2.0.1" }, "v1.10": { "Error": "golangci-lint version 'v1.10' isn't supported: we support only v2.0.0 and later versions" @@ -190,7 +190,7 @@ "Error": "golangci-lint version 'v1.9' isn't supported: we support only v2.0.0 and later versions" }, "v2.0": { - "TargetVersion": "v2.0.0" + "TargetVersion": "v2.0.1" } } }