diff --git a/.github/workflows/pre-main.yaml b/.github/workflows/pre-main.yaml index dc8106363..2ddf31378 100644 --- a/.github/workflows/pre-main.yaml +++ b/.github/workflows/pre-main.yaml @@ -56,11 +56,6 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} - # TODO: golangci-lint team recommends using a GitHub Action to perform golangci-lint responsibilities. However - # there does not appear to be a way to honor our existing .golangci.yml. For now, mimic developer behavior. - - name: Install golangci-lint - run: make install-lint - - name: Install checkmake run: | curl --location --output $CM_BIN --silent $CM_URL_LINUX @@ -69,6 +64,12 @@ jobs: - name: Install Shfmt uses: mfinelli/setup-shfmt@v3 + - name: Golangci-lint + uses: golangci/golangci-lint-action@v3 + with: + version: v1.54 + args: --timeout 10m0s + - name: Checkmake run: checkmake --config=.checkmake Makefile @@ -81,7 +82,7 @@ jobs: - name: Shfmt run: shfmt -d *.sh script - - name: markdownlint + - name: Markdownlint uses: nosborn/github-action-markdown-cli@v3.3.0 with: files: . @@ -97,10 +98,7 @@ jobs: with: config_file: .yamllint.yml - - name: Golangci-lint - run: golangci-lint run --timeout 10m0s - - - name: make vet + - name: Go vet run: make vet unit-tests: name: Run Unit Tests