diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c23689817..72ad3ec1e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,11 +22,11 @@ jobs: runs-on: ${{ matrix.platform }} steps: - name: Install Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: stable - - uses: actions/checkout@v4 - - uses: golangci/golangci-lint-action@v8 + - uses: actions/checkout@v6 + - uses: golangci/golangci-lint-action@v9 cross: name: Cross timeout-minutes: 10 @@ -37,11 +37,11 @@ jobs: runs-on: ${{ matrix.platform }} steps: - name: Install Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Cross working-directory: ci run: go run mage.go -v -w ../ crossBuild @@ -56,10 +56,10 @@ jobs: runs-on: ${{ matrix.platform }} steps: - name: Install Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Test run: go test -race -v ./... diff --git a/.golangci.yml b/.golangci.yml index 792db3618..16ec373f6 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,7 +6,6 @@ linters: - asasalint - asciicheck - bidichk - - bodyclose - contextcheck - durationcheck - errchkjson @@ -22,46 +21,10 @@ linters: - nilerr - nilnesserr - noctx - - protogetter - reassign - recvcheck - - rowserrcheck - - spancheck - - sqlclosecheck - - testifylint - unparam - - zerologlint - disable: - - prealloc - settings: - errcheck: - check-type-assertions: false - check-blank: false - lll: - line-length: 100 - tab-width: 4 - prealloc: - simple: false - range-loops: false - for-loops: false - whitespace: - multi-if: false - multi-func: false exclusions: - generated: lax presets: - - comments - - common-false-positives - legacy - std-error-handling - paths: - - third_party$ - - builtin$ - - examples$ -formatters: - exclusions: - generated: lax - paths: - - third_party$ - - builtin$ - - examples$ diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c1dbd5a3a..000000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: go -go_import_path: github.com/sirupsen/logrus -git: - depth: 1 -env: - - GO111MODULE=on -go: 1.15.x -os: linux -install: - - ./travis/install.sh -script: - - cd ci - - go run mage.go -v -w ../ crossBuild - - go run mage.go -v -w ../ lint - - go run mage.go -v -w ../ test diff --git a/travis/cross_build.sh b/travis/cross_build.sh deleted file mode 100755 index 5254435ca..000000000 --- a/travis/cross_build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -if [[ "$TRAVIS_GO_VERSION" =~ ^1\.13\. ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$GO111MODULE" == "on" ]]; then - $(go env GOPATH)/bin/gox -build-lib -fi diff --git a/travis/install.sh b/travis/install.sh deleted file mode 100755 index 837c82d06..000000000 --- a/travis/install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -# Install golanci 1.32.2 -if [[ "$TRAVIS_GO_VERSION" =~ ^1\.15\. ]]; then - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.32.2 -fi