From 562cf11b11504d175956150493d06ba2896c66a4 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 6 Aug 2020 17:10:43 +0700 Subject: [PATCH] run golangci-lint on Github Actions instead of Travis --- .github/workflows/lint.yml | 13 +++++++++++++ {.travis => .github/workflows}/no_ginkgo.sh | 0 .travis.yml | 5 ----- .travis/script.sh | 5 ----- 4 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/lint.yml rename {.travis => .github/workflows}/no_ginkgo.sh (100%) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 000000000..5ea252e08 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,13 @@ +on: [push, pull_request] +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Check that no non-test files import Ginkgo or Gomega + run: .github/workflows/no_ginkgo.sh + - name: golangci-lint + uses: golangci/golangci-lint-action@v1 + with: + # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. + version: v1.30 diff --git a/.travis/no_ginkgo.sh b/.github/workflows/no_ginkgo.sh similarity index 100% rename from .travis/no_ginkgo.sh rename to .github/workflows/no_ginkgo.sh diff --git a/.travis.yml b/.travis.yml index 44a660aa0..98add497a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ env: global: - TIMESCALE_FACTOR=20 matrix: - - TRAVIS_GOARCH=amd64 TESTMODE=lint - TRAVIS_GOARCH=amd64 TESTMODE=unit - TRAVIS_GOARCH=amd64 TESTMODE=integration - TRAVIS_GOARCH=386 TESTMODE=unit @@ -30,10 +29,6 @@ before_install: - travis_retry go get -t ./... script: - - | - if [ ${TESTMODE} == "lint" ]; then - travis_retry curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.27.0 - fi - .travis/script.sh diff --git a/.travis/script.sh b/.travis/script.sh index c00b6c8d6..0bfc95034 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -2,11 +2,6 @@ set -ex -if [ "${TESTMODE}" == "lint" ]; then - .travis/no_ginkgo.sh - ./bin/golangci-lint run ./... -fi - if [ "${TESTMODE}" == "unit" ]; then ginkgo -r -v -cover -randomizeAllSpecs -randomizeSuites -trace -skipPackage integrationtests,benchmark # run unit tests with the Go race detector