File tree 3 files changed +18
-5
lines changed
3 files changed +18
-5
lines changed Original file line number Diff line number Diff line change @@ -25,11 +25,11 @@ init:
25
25
.PHONY : update-deps
26
26
update-deps : mod-download
27
27
mkdir -p $(DEPSGOBIN )
28
- PATH=$(DEPSGOBIN ) :$$ PATH go get -u golang.org/x/tools/cmd/goimports
29
- PATH=$(DEPSGOBIN ) :$$ PATH go get -u github.com/golang/protobuf/protoc-gen-go
30
- PATH=$(DEPSGOBIN ) :$$ PATH go get -u github.com/envoyproxy/protoc-gen-validate
28
+ PATH=$(DEPSGOBIN ) :$$ PATH go install golang.org/x/tools/cmd/goimports
29
+ PATH=$(DEPSGOBIN ) :$$ PATH go install github.com/golang/protobuf/protoc-gen-go
31
30
PATH=$(DEPSGOBIN ) :$$ PATH go install github.com/envoyproxy/protoc-gen-validate
32
- PATH=$(DEPSGOBIN ) :$$ PATH go get -u github.com/golang/mock/gomock
31
+ PATH=$(DEPSGOBIN ) :$$ PATH go install github.com/envoyproxy/protoc-gen-validate
32
+ PATH=$(DEPSGOBIN ) :$$ PATH go get github.com/golang/mock/gomock
33
33
PATH=$(DEPSGOBIN ) :$$ PATH go install github.com/golang/mock/mockgen
34
34
PATH=$(DEPSGOBIN ) :$$ PATH go install github.com/onsi/ginkgo/ginkgo
35
35
@@ -63,4 +63,4 @@ run-tests:
63
63
-progress \
64
64
-race \
65
65
-compilers=4 \
66
- -skipPackage=$(SKIP_PACKAGES ) $(TEST_PKG )
66
+ -skipPackage=$(SKIP_PACKAGES ) $(TEST_PKG )
Original file line number Diff line number Diff line change
1
+ changelog :
2
+ - type : FIX
3
+ description : Don't copy configured skip directories.
4
+ issueLink : https://github.com/solo-io/anyvendor/issues/17
Original file line number Diff line number Diff line change 6
6
"log"
7
7
"os"
8
8
"path/filepath"
9
+ "strings"
9
10
"unicode"
10
11
11
12
"github.com/mattn/go-zglob"
@@ -112,6 +113,14 @@ func NewDefaultCopier() *copier {
112
113
}
113
114
114
115
func (c * copier ) Copy (src , dst string ) (int64 , error ) {
116
+ for _ , skip := range c .skipDirs {
117
+ if ! strings .Contains (src , skip ) {
118
+ continue
119
+ }
120
+ // don't copy skip matches
121
+ return 0 , nil
122
+ }
123
+
115
124
log .Printf ("copying %v -> %v" , src , dst )
116
125
117
126
if err := c .fs .MkdirAll (filepath .Dir (dst ), os .ModePerm ); err != nil {
You can’t perform that action at this time.
0 commit comments