Skip to content

Commit

Permalink
lint with action, remove pinning toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
karlhungus committed Sep 13, 2023
1 parent 944c783 commit b015a46
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 55 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,3 @@ jobs:

- name: Test
run: make test

- name: Lint
run: make lint
56 changes: 56 additions & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# From: https://github.com/golangci/golangci-lint-action
name: golangci-lint
on:
push:
branches:
- master
- main
pull_request:

permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
# pull-requests: read

jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '1.21'
cache: false
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
# Require: The version of golangci-lint to use.
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
version: v1.54

# Optional: working directory, useful for monorepos
# working-directory: somedir

# Optional: golangci-lint command line arguments.
#
# Note: By default, the `.golangci.yml` file should be at the root of the repository.
# The location of the configuration file can be changed by using `--config=`
# args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0

# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true

# Optional: if set to true, then all caching functionality will be completely disabled,
# takes precedence over all other caching options.
# skip-cache: true

# Optional: if set to true, then the action won't cache or restore ~/go/pkg.
# skip-pkg-cache: true

# Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
# skip-build-cache: true

# Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
# install-mode: "goinstall"
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,5 @@ install:
test:
go test -coverprofile=coverage.out -v ./...

lint: bin/golangci-lint-1.54.2
./bin/golangci-lint-1.54.2 run ./...

bin/golangci-lint-1.54.2:
./hack/fetch-golangci-lint.sh
lint:
golangci-lint run -v "./..."
2 changes: 0 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/salesforce/kubelet-summary-exporter

go 1.21

toolchain go1.21.1

require (
github.com/alecthomas/kong v0.7.1
github.com/google/go-cmp v0.5.9
Expand Down
45 changes: 0 additions & 45 deletions hack/fetch-golangci-lint.sh

This file was deleted.

0 comments on commit b015a46

Please sign in to comment.