From 3e01ffe8bf15a322a38754a0a5e33a444a53d2a1 Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Wed, 25 May 2022 14:35:39 -0700 Subject: [PATCH] Revert "Add GitHub Action for golangci-lint (#5973)" (#6138) This reverts commit 5fe5859c38f3392a0a0de34c4fb10d7843d6e290. Per #5973: > we will eventually want to go back to doing this in boulder-tools, so it's easy > to run the lints locally. But this is useful so we can unblock testing on go 1.18beta2. --- .github/workflows/boulder-ci.yml | 2 +- .github/workflows/golangci-lint.yml | 26 -------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 .github/workflows/golangci-lint.yml 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