diff --git a/.github/workflows/bats-hub.yml b/.github/workflows/bats-hub.yml index 2336b67f5..cda25b660 100644 --- a/.github/workflows/bats-hub.yml +++ b/.github/workflows/bats-hub.yml @@ -31,7 +31,6 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.go-version }} - id: go - name: "Check out CrowdSec repository" uses: actions/checkout@v3 diff --git a/.github/workflows/bats-mysql.yml b/.github/workflows/bats-mysql.yml index db69c8800..455b4da72 100644 --- a/.github/workflows/bats-mysql.yml +++ b/.github/workflows/bats-mysql.yml @@ -38,7 +38,6 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.go-version }} - id: go - name: "Check out CrowdSec repository" uses: actions/checkout@v3 diff --git a/.github/workflows/bats-postgres.yml b/.github/workflows/bats-postgres.yml index 60c16cb3c..ae580d48a 100644 --- a/.github/workflows/bats-postgres.yml +++ b/.github/workflows/bats-postgres.yml @@ -39,7 +39,6 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.go-version }} - id: go - name: "Check out CrowdSec repository" uses: actions/checkout@v3 diff --git a/.github/workflows/bats-sqlite-coverage.yml b/.github/workflows/bats-sqlite-coverage.yml index 634cfffab..3fdf6972b 100644 --- a/.github/workflows/bats-sqlite-coverage.yml +++ b/.github/workflows/bats-sqlite-coverage.yml @@ -28,7 +28,6 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.go-version }} - id: go - name: "Check out CrowdSec repository" uses: actions/checkout@v3 diff --git a/.github/workflows/ci-windows-build-msi.yml b/.github/workflows/ci-windows-build-msi.yml index 5c07dcaf6..86ad1e478 100644 --- a/.github/workflows/ci-windows-build-msi.yml +++ b/.github/workflows/ci-windows-build-msi.yml @@ -19,7 +19,6 @@ on: - windows/installer/*.wxs - .github/workflows/ci-windows-build-msi.yml - jobs: build: strategy: @@ -35,7 +34,6 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.go-version }} - id: go - name: Check out code into the Go module directory uses: actions/checkout@v3 diff --git a/.github/workflows/ci_golangci-lint.yml b/.github/workflows/ci_golangci-lint.yml deleted file mode 100644 index 3e3459963..000000000 --- a/.github/workflows/ci_golangci-lint.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: golangci-lint - -on: - push: - tags: - - v* - branches: - - master - - releases/** - paths-ignore: - - 'docs/**' - - 'mkdocs.yml' - - 'README.md' - pull_request: - paths-ignore: - - 'docs/**' - - 'mkdocs.yml' - - 'README.md' -jobs: - golangci: - strategy: - matrix: - os: [ubuntu-latest, windows-2022] - name: lint - runs-on: ${{ matrix.os }} - steps: - - name: Set up Go 1.20 - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - id: go - - uses: actions/checkout@v3 - - name: golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - version: v1.51 - args: --issues-exit-code=1 --timeout 10m - only-new-issues: false diff --git a/.github/workflows/go-tests-windows.yml b/.github/workflows/go-tests-windows.yml index 60ced8efb..e6e211882 100644 --- a/.github/workflows/go-tests-windows.yml +++ b/.github/workflows/go-tests-windows.yml @@ -33,7 +33,6 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.go-version }} - id: go - name: Check out CrowdSec repository uses: actions/checkout@v3 @@ -69,3 +68,10 @@ jobs: with: files: coverage.out flags: unit-windows + + - name: golangci-lint + uses: golangci/golangci-lint-action@v3 + with: + version: v1.51 + args: --issues-exit-code=1 --timeout 10m + only-new-issues: false diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index d7b1b149b..8393df1e1 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -114,7 +114,6 @@ jobs: uses: actions/setup-go@v3 with: go-version: ${{ matrix.go-version }} - id: go - name: Check out CrowdSec repository uses: actions/checkout@v3 @@ -153,3 +152,10 @@ jobs: with: files: coverage.out flags: unit-linux + + - name: golangci-lint + uses: golangci/golangci-lint-action@v3 + with: + version: v1.51 + args: --issues-exit-code=1 --timeout 10m + only-new-issues: false diff --git a/.github/workflows/release_publish-package.yml b/.github/workflows/release_publish-package.yml index ed215c43d..cbfa1398f 100644 --- a/.github/workflows/release_publish-package.yml +++ b/.github/workflows/release_publish-package.yml @@ -15,11 +15,12 @@ jobs: name: Build and upload binary package runs-on: ubuntu-latest steps: + - name: "Set up Go ${{ matrix.go-version }}" uses: actions/setup-go@v3 with: go-version: ${{ matrix.go-version }} - id: go + - name: Check out code into the Go module directory uses: actions/checkout@v3 with: @@ -51,6 +52,7 @@ jobs: strategy: matrix: go-version: ["1.20.1"] + name: Build and upload binary package runs-on: ubuntu-latest steps: @@ -59,6 +61,7 @@ jobs: with: go-version: ${{ matrix.go-version }} id: go + - name: Check out code into the Go module directory uses: actions/checkout@v3 with: @@ -81,6 +84,7 @@ jobs: run: | make release BUILD_STATIC=yes mv crowdsec-release.tgz crowdsec-release-static.tgz + - name: Upload to release uses: JasonEtco/upload-to-release@master with: