diff --git a/.github/workflows/boulder-ci.yml b/.github/workflows/boulder-ci.yml index 7ee358a32..45a75de4b 100644 --- a/.github/workflows/boulder-ci.yml +++ b/.github/workflows/boulder-ci.yml @@ -40,7 +40,7 @@ jobs: # Tests command definitions. Use the entire docker-compose command you want to run. tests: # Run ./test.sh --help for a description of each of the flags. - - "./t.sh --generate --make-artifacts" + - "./t.sh --lints --generate --make-artifacts" - "./t.sh --integration" # Testing Config Changes: # Config changes that have landed in main but not yet been applied to diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml deleted file mode 100644 index 328de44df..000000000 --- a/.github/workflows/golangci-lint.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: golangci-lint -on: - # Triggers the workflow on push or pull request events but only for the main branch - push: - branches: - - main - - release-branch-* - pull_request: - branches: - - '*' -permissions: - contents: read - pull-requests: read -jobs: - golangci: - name: lint - runs-on: ubuntu-latest - steps: - - uses: actions/setup-go@v3 - - uses: actions/checkout@v3 - - name: golangci-lint - uses: golangci/golangci-lint-action@v2 - with: - version: v1.46.2 - args: --timeout 9m - only-new-issues: true