diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a49bddb..95f7def 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Lint uses: golangci/golangci-lint-action@v8 with: - version: v2.1.6 + version: v2.4.0 - name: Build run: go build ./... @@ -34,22 +34,22 @@ jobs: - name: Test run: make test - - name: SonarQube Scan - uses: sonarsource/sonarqube-scan-action@v4 - env: - SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - SONAR_HOST_URL: https://sonarqube.collibra.dev - with: - args: > - -Dsonar.pullrequest.github.repository=collibra/go-set - - - name: SonarQube Quality Gate - uses: sonarsource/sonarqube-quality-gate-action@v1.1.0 - timeout-minutes: 10 - continue-on-error: true - env: - SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} - SONAR_HOST_URL: https://sonarqube.collibra.dev +# - name: SonarQube Scan +# uses: sonarsource/sonarqube-scan-action@v4 +# env: +# SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} +# SONAR_HOST_URL: https://sonarqube.collibra.dev +# with: +# args: > +# -Dsonar.pullrequest.github.repository=collibra/go-set +# +# - name: SonarQube Quality Gate +# uses: sonarsource/sonarqube-quality-gate-action@v1.1.0 +# timeout-minutes: 10 +# continue-on-error: true +# env: +# SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} +# SONAR_HOST_URL: https://sonarqube.collibra.dev - name: FOSSA Scan uses: fossas/fossa-action@v1 diff --git a/.golangci.yml b/.golangci.yml index 4d1215f..8eadf20 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -38,7 +38,7 @@ linters: - unparam - unused - whitespace - - wsl + - wsl_v5 settings: cyclop: max-complexity: 20 @@ -102,9 +102,13 @@ linters: - .WithMessagef( - .WithStack( - go-multierror.Append( - wsl: - allow-assign-and-anything: true - allow-cuddle-declarations: true + wsl_v5: + allow-first-in-block: true + allow-whole-block: false + branch-max-lines: 2 + disable: + - assign + - decl exclusions: generated: lax presets: