Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

chore: remove golintci from checks (#270) | chore: bump godog to v0.10.0 (#271) backport for 7.9.x #273

Merged
merged 2 commits into from
Sep 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,8 @@ pipeline {
unstash 'source'
withGoEnv(version: "${GO_VERSION}"){
dir(BASE_DIR){
catchError(message: 'There were some failures when running pre-commit checks', buildResult: 'SUCCESS') {
sh script: '.ci/scripts/install-dependencies.sh', label: 'Install dependencies'
preCommit(commit: "${GIT_BASE_COMMIT}", junit: true)
}
sh script: '.ci/scripts/install-dependencies.sh', label: 'Install dependencies'
preCommit(commit: "${GIT_BASE_COMMIT}", junit: true)
}
}
}
Expand Down
32 changes: 0 additions & 32 deletions .ci/scripts/golangci-lint.sh

This file was deleted.

1 change: 0 additions & 1 deletion .ci/scripts/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ set -euxo pipefail

# Install some other dependencies required for the pre-commit
go get -v golang.org/x/lint/golint
go get -v github.com/golangci/golangci-lint/cmd/[email protected]
go get -v github.com/go-lintpack/lintpack/...
go get -v github.com/go-critic/go-critic/...
lintpack build -o bin/gocritic -linter.version='v0.3.4' -linter.name='gocritic' github.com/go-critic/go-critic/checkers
Expand Down
10 changes: 0 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,3 @@ repos:
- id: check-jjbb
- id: check-gherkin-lint
args: ["--disable", "AvoidOutlineForSingleExample,TooClumsy,TooLongStep,TooManyDifferentTags,TooManySteps"]

- repo: local
hooks:
- id: golangci-lint
name: 'golangci-lint'
entry: .ci/scripts/golangci-lint.sh
language: 'script'
verbose: true
files: '\.go$'
description: "Runs `golangci-lint`, requires https://github.com/golangci/golangci-lint"
2 changes: 1 addition & 1 deletion e2e/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ install:
.PHONY: install-godog
install-godog: export GO111MODULE := on
install-godog:
go get -v github.com/cucumber/godog/cmd/godog@v0.9.0
go get -v github.com/cucumber/godog/cmd/godog@v0.10.0

.PHONY: functional-test
functional-test: install-godog
Expand Down
Loading