Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 6648c81

Browse files
committed
[FAB-4893] Update vendoring to dep (lint fix)
This patch fixes the lint target by depending on populate. Change-Id: Id1362997d0cf7201c0294d5defb47a9803dc060f Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent 8f248b0 commit 6648c81

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
# clean: stops docker conatainers used for integration testing
1515
# mock-gen: generate mocks needed for testing (using mockgen)
1616
# populate: populates generated files (not included in git) - currently only vendor
17-
# populate-vendor: populate the vendor directory based on the lock
17+
# populate-vendor: populate the vendor directory based on the lock
18+
# populate-clean: cleans up populated files (might become part of clean eventually)
1819
#
1920
#
2021
# Instructions to generate .tx files used for creating channels:
@@ -50,7 +51,7 @@ checks: depend license lint spelling
5051
license:
5152
@test/scripts/check_license.sh
5253

53-
lint:
54+
lint: populate
5455
@test/scripts/check_lint.sh
5556

5657
spelling:
@@ -93,9 +94,11 @@ populate-vendor:
9394
@echo "Populating vendor ..."
9495
@dep ensure -vendor-only
9596

97+
populate-clean:
98+
rm -Rf vendor
99+
96100
clean:
97101
rm -Rf /tmp/enroll_user /tmp/msp /tmp/keyvaluestore
98102
rm -f integration-report.xml report.xml
99103
cd test/fixtures && docker-compose down
100104
cd test/fixtures && docker-compose -f docker-compose-unit.yaml down
101-
rm -Rf vendor

test/scripts/dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if [ "$FABRIC_SDKGO_DEPEND_INSTALL" = "true" ]; then
1717
go get -u github.com/client9/misspell/cmd/misspell
1818
go get -u github.com/golang/lint/golint
1919
go get -u golang.org/x/tools/cmd/goimports
20-
go get -u github.com/golang/mock/mockgen
20+
go get -u github.com/golang/mock/mockgen
2121
fi
2222

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

0 commit comments

Comments
 (0)