Skip to content

Commit

Permalink
[FAB-4893] Update vendoring to dep (lint fix)
Browse files Browse the repository at this point in the history
This patch fixes the lint target by depending on populate.

Change-Id: Id1362997d0cf7201c0294d5defb47a9803dc060f
Signed-off-by: Troy Ronda <troy@troyronda.com>
  • Loading branch information
troyronda committed Aug 25, 2017
1 parent 8f248b0 commit 6648c81
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
# clean: stops docker conatainers used for integration testing
# mock-gen: generate mocks needed for testing (using mockgen)
# populate: populates generated files (not included in git) - currently only vendor
# populate-vendor: populate the vendor directory based on the lock
# populate-vendor: populate the vendor directory based on the lock
# populate-clean: cleans up populated files (might become part of clean eventually)
#
#
# Instructions to generate .tx files used for creating channels:
Expand Down Expand Up @@ -50,7 +51,7 @@ checks: depend license lint spelling
license:
@test/scripts/check_license.sh

lint:
lint: populate
@test/scripts/check_lint.sh

spelling:
Expand Down Expand Up @@ -93,9 +94,11 @@ populate-vendor:
@echo "Populating vendor ..."
@dep ensure -vendor-only

populate-clean:
rm -Rf vendor

clean:
rm -Rf /tmp/enroll_user /tmp/msp /tmp/keyvaluestore
rm -f integration-report.xml report.xml
cd test/fixtures && docker-compose down
cd test/fixtures && docker-compose -f docker-compose-unit.yaml down
rm -Rf vendor
2 changes: 1 addition & 1 deletion test/scripts/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if [ "$FABRIC_SDKGO_DEPEND_INSTALL" = "true" ]; then
go get -u github.com/client9/misspell/cmd/misspell
go get -u github.com/golang/lint/golint
go get -u golang.org/x/tools/cmd/goimports
go get -u github.com/golang/mock/mockgen
go get -u github.com/golang/mock/mockgen
fi

# Install specific version of go dep (particularly for CI)
Expand Down

0 comments on commit 6648c81

Please sign in to comment.