Skip to content

Commit

Permalink
Merge pull request trustbloc#94 from fqutishat/92
Browse files Browse the repository at this point in the history
ci: Switch linter check to use golangci/build-runner image
  • Loading branch information
fqutishat authored May 16, 2019
2 parents 5e03e3c + e3f20e2 commit 4976cd2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 76 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ FABRIC_TOOLS_VERSION ?= 2.0.0-alpha
FABRIC_TOOLS_TAG ?= $(ARCH)-$(FABRIC_TOOLS_VERSION)


depend: version
@scripts/dependencies.sh

checks: version depend license lint
checks: version license lint

lint:
@scripts/check_lint.sh
Expand Down
15 changes: 2 additions & 13 deletions scripts/check_lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,7 @@
set -e


GOLANGCI_LINT_CMD=golangci-lint
DOCKER_CMD=docker

PWD=`pwd`
echo "Running golangci-lint :: pwd" $PWD

$GOLANGCI_LINT_CMD run -c "$GOPATH/src/github.com/trustbloc/fabric-peer-ext/.golangci.yml"

cd ./mod/peer
echo "extensions project path" `pwd`

$GOLANGCI_LINT_CMD run -c "$GOPATH/src/github.com/trustbloc/fabric-peer-ext/.golangci.yml"

cd $PWD

echo "golangci-lint finished successfully :: pwd" $PWD
${DOCKER_CMD} run --rm -e GOPROXY=${GOPROXY} -v $(pwd):/goapp -e RUN=1 -e REPO=github.com/trustbloc/bloc-node golangci/build-runner goenvbuild
59 changes: 0 additions & 59 deletions scripts/dependencies.sh

This file was deleted.

0 comments on commit 4976cd2

Please sign in to comment.