diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91fcb5bc1e..b3d24dcf02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,15 +6,11 @@ jobs: static-analysis: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - name: Run ShellCheck run: | shellcheck scripts/*.sh - - name: Run gofmt - run: | - ./scripts/checks.sh test: strategy: matrix: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml new file mode 100644 index 0000000000..067e109c23 --- /dev/null +++ b/.github/workflows/golangci-lint.yml @@ -0,0 +1,46 @@ +name: golangci-lint +on: + push: + tags: + - v* + branches: + - master + - main + pull_request: +permissions: + contents: read + # Optional: allow read access to pull request. Use with `only-new-issues` option. + # pull-requests: read +jobs: + golangci: + name: lint + runs-on: ubuntu-latest + steps: + - uses: actions/setup-go@v3 + with: + go-version: 1.17 + - uses: actions/checkout@v3 + - name: golangci-lint + uses: golangci/golangci-lint-action@v3 + with: + # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version + version: v1.29 + + # Optional: working directory, useful for monorepos + # working-directory: somedir + + # Optional: golangci-lint command line arguments. + # args: --issues-exit-code=0 + + # Optional: show only new issues if it's a pull request. The default value is `false`. + # only-new-issues: true + + # Optional: if set to true then the all caching functionality will be complete disabled, + # takes precedence over all other caching options. + # skip-cache: true + + # Optional: if set to true then the action don't cache or restore ~/go/pkg. + # skip-pkg-cache: true + + # Optional: if set to true then the action don't cache or restore ~/.cache/go-build. + # skip-build-cache: true diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000000..4ad9dfc3cc --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,3 @@ +linters: + enable: + - gofmt diff --git a/scripts/checks.sh b/scripts/checks.sh deleted file mode 100755 index 61cc2c10d8..0000000000 --- a/scripts/checks.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") - -go_fmt() { - format=$(go fmt ./...) - if [[ ${format} ]]; then - echo "go fmt failed:" - echo "${format}" - exit 1 - else - echo "go fmt passed" - fi -} - -main() { - cd "${BASEDIR}"/.. || return - - go_fmt -} - -main "$@" \ No newline at end of file