@@ -15,17 +15,17 @@ DIRS=$(shell go list -f {{.Dir}} goa.design/goa/expr/...)
15
15
# Only list test and build dependencies
16
16
# Standard dependencies are installed via go get
17
17
DEPEND =\
18
- github.com/sergi/go-diff/diffmatchpatch \
19
18
golang.org/x/lint/golint \
20
19
golang.org/x/tools/cmd/goimports \
21
- github.com/hashicorp/go-getter \
22
20
github.com/cheggaaa/pb \
21
+ github.com/hashicorp/go-getter \
23
22
github.com/golang/protobuf/protoc-gen-go \
24
23
github.com/golang/protobuf/proto
24
+ # github.com/sergi/go-diff/diffmatchpatch \
25
25
26
- all : lint gen test
26
+ all : lint test
27
27
28
- travis : depend all build -examples clean
28
+ travis : depend all test -examples test-plugins
29
29
30
30
# Install protoc
31
31
GOOS =$(shell go env GOOS)
@@ -66,71 +66,41 @@ lint:
66
66
echo " ^ - Lint errors!" && echo && exit 1; \
67
67
fi
68
68
69
- gen :
70
- @cd cmd/goa && \
71
- go install && \
72
- rm -rf $(GOPATH ) /src/goa.design/goa/examples/basic/cmd && \
73
- rm -rf $(GOPATH ) /src/goa.design/goa/examples/cellar/cmd/cellar-cli && \
74
- rm -rf $(GOPATH ) /src/goa.design/goa/examples/error/cmd && \
75
- rm -rf $(GOPATH ) /src/goa.design/goa/examples/multipart/cmd && \
76
- rm -rf $(GOPATH ) /src/goa.design/goa/examples/security/cmd && \
77
- goa gen goa.design/goa/examples/basic/design -o $(GOPATH ) /src/goa.design/goa/examples/basic && \
78
- goa example goa.design/goa/examples/basic/design -o $(GOPATH ) /src/goa.design/goa/examples/basic && \
79
- goa gen goa.design/goa/examples/cellar/design -o $(GOPATH ) /src/goa.design/goa/examples/cellar && \
80
- goa example goa.design/goa/examples/cellar/design -o $(GOPATH ) /src/goa.design/goa/examples/cellar && \
81
- goa gen goa.design/goa/examples/error/design -o $(GOPATH ) /src/goa.design/goa/examples/error && \
82
- goa example goa.design/goa/examples/error/design -o $(GOPATH ) /src/goa.design/goa/examples/error && \
83
- goa gen goa.design/goa/examples/multipart/design -o $(GOPATH ) /src/goa.design/goa/examples/multipart && \
84
- goa example goa.design/goa/examples/multipart/design -o $(GOPATH ) /src/goa.design/goa/examples/multipart && \
85
- goa gen goa.design/goa/examples/security/design -o $(GOPATH ) /src/goa.design/goa/examples/security && \
86
- goa example goa.design/goa/examples/security/design -o $(GOPATH ) /src/goa.design/goa/examples/security && \
87
- goa gen goa.design/goa/examples/streaming/design -o $(GOPATH ) /src/goa.design/goa/examples/streaming && \
88
- goa example goa.design/goa/examples/streaming/design -o $(GOPATH ) /src/goa.design/goa/examples/streaming
89
-
90
- build-examples :
91
- @cd $(GOPATH ) /src/goa.design/goa/examples/basic && \
92
- go build ./cmd/calc && go build ./cmd/calc-cli
93
- @cd $(GOPATH ) /src/goa.design/goa/examples/cellar && \
94
- go build ./cmd/cellar && go build ./cmd/cellar-cli
95
- @cd $(GOPATH ) /src/goa.design/goa/examples/error && \
96
- go build ./cmd/divider && go build ./cmd/divider-cli
97
- @cd $(GOPATH ) /src/goa.design/goa/examples/multipart && \
98
- go build ./cmd/resume && go build ./cmd/resume-cli
99
- @cd $(GOPATH ) /src/goa.design/goa/examples/security && \
100
- go build ./cmd/multi_auth && go build ./cmd/multi_auth-cli
101
- @cd $(GOPATH ) /src/goa.design/goa/examples/streaming && \
102
- go build ./cmd/chatter && go build ./cmd/chatter-cli
103
-
104
- clean :
105
- @cd $(GOPATH ) /src/goa.design/goa/examples/basic && \
106
- rm -f calc calc-cli
107
- @cd $(GOPATH ) /src/goa.design/goa/examples/cellar && \
108
- rm -f cellar cellar-cli
109
- @cd $(GOPATH ) /src/goa.design/goa/examples/error && \
110
- rm -f divider divider-cli
111
- @cd $(GOPATH ) /src/goa.design/goa/examples/multipart && \
112
- rm -f resume resume-cli
113
- @cd $(GOPATH ) /src/goa.design/goa/examples/security && \
114
- rm -f multi_auth multi_auth-cli
115
- @cd $(GOPATH ) /src/goa.design/goa/examples/streaming && \
116
- rm -f chatter chatter-cli
117
-
118
69
test :
119
70
go test ./...
120
71
121
72
ifeq ($(GOOS ) ,windows)
122
- PLUGINS_BRANCH ="$(GOPATH ) \src\goa.design\plugins"
73
+ EXAMPLES_DIR ="$(GOPATH ) \src\goa.design\examples"
74
+ else
75
+ EXAMPLES_DIR ="$(GOPATH ) /src/goa.design/examples"
76
+ endif
77
+ test-examples :
78
+ @if [ -z $( GOA_BRANCH) ]; then\
79
+ GOA_BRANCH=$$(git rev-parse --abbrev-ref HEAD ) ; \
80
+ fi
81
+ @if [ ! -d " $( GOPATH) /src/goa.design/examples" ]; then\
82
+ git clone https://github.com/goadesign/examples.git $(EXAMPLES_DIR ) ; \
83
+ fi
84
+ @cd $(EXAMPLES_DIR ) && git checkout $(GOA_BRANCH ) || echo " Using master branch in examples repo" && \
85
+ make -k travis || (echo " Tests in examples repo (https://github.com/goadesign/examples) failed" \
86
+ "due to changes in goa repo (branch : $(GOA_BRANCH ) )!" \
87
+ "Create a branch with name '$(GOA_BRANCH)' in the examples repo and fix these errors." && exit 1)
88
+ @rm -rf "$(GOPATH)/src/goa.design/examples"
89
+
90
+ ifeq ($(GOOS ) ,windows)
91
+ PLUGINS_DIR ="$(GOPATH ) \src\goa.design\plugins"
123
92
else
124
- PLUGINS_BRANCH ="$(GOPATH ) /src/goa.design/plugins"
93
+ PLUGINS_DIR ="$(GOPATH ) /src/goa.design/plugins"
125
94
endif
126
95
test-plugins :
127
96
@if [ -z $( GOA_BRANCH) ]; then\
128
97
GOA_BRANCH=$$(git rev-parse --abbrev-ref HEAD ) ; \
129
98
fi
130
99
@if [ ! -d " $( GOPATH) /src/goa.design/plugins" ]; then\
131
- git clone https://github.com/goadesign/plugins.git $(PLUGINS_BRANCH ) ; \
100
+ git clone https://github.com/goadesign/plugins.git $(PLUGINS_DIR ) ; \
132
101
fi
133
- @cd $(PLUGINS_BRANCH ) && git checkout $(GOA_BRANCH ) || echo " Using master branch in plugins repo" && \
102
+ @cd $(PLUGINS_DIR ) && git checkout $(GOA_BRANCH ) || echo " Using master branch in plugins repo" && \
134
103
make -k test-plugins || (echo " Tests in plugin repo (https://github.com/goadesign/plugins) failed" \
135
104
"due to changes in goa repo (branch : $(GOA_BRANCH ) )!" \
136
105
"Create a branch with name '$(GOA_BRANCH)' in the plugin repo and fix these errors." && exit 1)
106
+ @rm -rf "$(GOPATH)/src/goa.design/plugins"
0 commit comments