Merge branch 'master' into dependabot/github_actions/actions/checkout-3
This commit is contained in:
commit
3555b3dcc0
4
.github/workflows/pr.yml
vendored
4
.github/workflows/pr.yml
vendored
@ -34,11 +34,7 @@ jobs:
|
|||||||
- name: checkout
|
- name: checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: lint
|
- name: lint
|
||||||
<<<<<<< HEAD
|
|
||||||
uses: golangci/golangci-lint-action@v3
|
uses: golangci/golangci-lint-action@v3
|
||||||
=======
|
|
||||||
uses: golangci/golangci-lint-action@v3.1.0
|
|
||||||
>>>>>>> 0923093071cb (update workflows)
|
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
with:
|
with:
|
||||||
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
||||||
|
Loading…
Reference in New Issue
Block a user