Skip to content

Commit

Permalink
Update Go to v1.20 and golangci-lint
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Doherty <[email protected]>
  • Loading branch information
chrisdoherty4 committed May 2, 2023
1 parent 413b73f commit 8d9d1c4
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 67 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
- "v*"
pull_request:
env:
CGO_ENABLED: 0
GO_VERSION: 1.18
CGO_ENABLED: "0"
GO_VERSION: "1.20"
jobs:
verify:
name: Verify
Expand Down
25 changes: 1 addition & 24 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ linters:
- asciicheck
- bodyclose
- cyclop
- deadcode
- dogsled
- dupl
- durationcheck
Expand All @@ -114,7 +113,6 @@ linters:
- goprintffuncname
- gosimple
- govet
- ifshort
- importas
- ineffassign
- makezero
Expand All @@ -125,40 +123,19 @@ linters:
- noctx
- nolintlint
- predeclared
# disabling for the initial iteration of the linting tool
# - promlinter
- revive
- rowserrcheck
- sqlclosecheck
- staticcheck
- structcheck
- stylecheck
- thelper
- tparallel
- typecheck
- unconvert
- unparam
- unused
- varcheck
- wastedassign
- whitespace
# Disabled linters, due to being misaligned with Go practices
# - exhaustivestruct
# - gochecknoglobals
# - gochecknoinits
# - goconst
# - godox
# - goerr113
# - gomnd
# - lll
# - nlreturn
# - testpackage
# - wsl
# Disabled linters, due to not being relevant to our code base:
# - maligned
# - prealloc "For most programs usage of prealloc will be a premature optimization."
# Disabled linters due to bad error messages or bugs
# - tagliatelle
issues:
# Excluding configuration per-path, per-linter, per-text and per-source
exclude-rules:
Expand Down Expand Up @@ -187,6 +164,6 @@ issues:
- linters:
- tparallel
text: "call t.Parallel on the top level as well as its subtests"
# Don't hide lint issues just because there are many of them
# Don't hide lint issues just because there are many of them
max-same-issues: 0
max-issues-per-linter: 0
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ CONTROLLER_GEN := $(GO) run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.
GOFUMPT := $(GO) run mvdan.cc/[email protected]
KUSTOMIZE := $(GO) run sigs.k8s.io/kustomize/kustomize/[email protected]
SETUP_ENVTEST := $(GO) run sigs.k8s.io/controller-runtime/tools/[email protected]
GOLANGCI_LINT := $(GO) run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50
GOLANGCI_LINT := $(GO) run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52
YAMLFMT := $(GO) run github.com/google/yamlfmt/cmd/[email protected]

# Installed tools
Expand Down Expand Up @@ -200,7 +200,7 @@ $(SHELLCHECK_BIN):
shellcheck: $(SHELLCHECK_BIN)
$(SHELLCHECK_BIN) $(shell find . -name "*.sh")

HADOLINT_VERSION ?= v2.8.0
HADOLINT_VERSION ?= v2.12.1-beta
HADOLINT_BIN := out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)
$(HADOLINT_BIN):
mkdir -p out/linters
Expand Down
2 changes: 1 addition & 1 deletion buf.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ deps:
- remote: buf.build
owner: googleapis
repository: googleapis
commit: 75b4300737fb4efca0831636be94e517
commit: 5ae7f88519b04fe1965da0f8a375a088
1 change: 0 additions & 1 deletion cmd/tink-worker/worker/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,6 @@ func (w *Worker) ProcessWorkflowActions(ctx context.Context) error {

if len(actions.GetActionList()) == actionIndex+1 {
l.Info("reached to end of workflow")
turn = false
break
}

Expand Down
32 changes: 0 additions & 32 deletions internal/proto/workflow.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ let
# go 1.18.5
owner = "NixOS";
repo = "nixpkgs";
#branch@date: nixpkgs-unstable@2022-09-02
rev = "ee01de29d2f58d56b1be4ae24c24bd91c5380cea";
sha256 = "0829fqp43cp2ck56jympn5kk8ssjsyy993nsp0fjrnhi265hqps7";
# branch@date: nixpkgs-unstable@2023-03-30
rev = "8b3bc690e201c8d3cbd14633dbf3462a820e73f2";
sha256 = "sha256-+ckiCxbGFSs1/wHKCXAZnvb37Htf6k5nmQE3T0Y7hK8=";
}) { };

go_1_18_5 = pkgs.go;
go_1_20_3 = pkgs.go;

in mkShell {
buildInputs = [
docker-compose
git
gnumake
gnused
go_1_18_5
go_1_20_3
jq
nixfmt
nodePackages.prettier
Expand Down

0 comments on commit 8d9d1c4

Please sign in to comment.