fix(ci): generate must clean client generated files

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Sep 4, 2019 · 77a69d4 · 77a69d4
1 parent c8c077d
commit 77a69d4
Show file tree

Hide file tree

Showing 27 changed files with 28 additions and 27 deletions.
diff --git a/client/Makefile b/client/Makefile
@@ -115,8 +115,8 @@ packages/%: packages/template/%.hbs $(OUR_PROTOS)
 	npm run prettify -- $(TEMPLATES_GENERATE)
 
 .IGNORE \
-.PHONY: generate.clean
-generate.clean:
+.PHONY: clean.generate
+clean.generate:
 	rm -rf $(GENERATE)
 
 ### BUNDLER

diff --git a/core/Makefile b/core/Makefile
@@ -118,6 +118,7 @@ clean:
 	rm -rf vendor
 	@# FIXME: investigate
 	rm -rf google gogoproto github.com google.golang.org
+	cd $(PWD)/../client && make clean.generate
 
 .PHONY: generate_local
 generate_local: $(GENERATION_TARGETS)

diff --git a/core/api/node/kind.pb.go b/core/api/node/kind.pb.go
diff --git a/core/api/node/service.pb.go b/core/api/node/service.pb.go
diff --git a/core/api/p2p/service.pb.go b/core/api/p2p/service.pb.go
diff --git a/core/chunk/chunk.pb.go b/core/chunk/chunk.pb.go
diff --git a/core/crypto/keypair/keypair.pb.go b/core/crypto/keypair/keypair.pb.go
diff --git a/core/crypto/sigchain/sigchain.pb.go b/core/crypto/sigchain/sigchain.pb.go
diff --git a/core/daemon/daemon.pb.go b/core/daemon/daemon.pb.go
diff --git a/core/entity/config.pb.go b/core/entity/config.pb.go
diff --git a/core/entity/contact.pb.go b/core/entity/contact.pb.go
diff --git a/core/entity/conversation.pb.go b/core/entity/conversation.pb.go
diff --git a/core/entity/device.pb.go b/core/entity/device.pb.go
diff --git a/core/entity/device_push_config.pb.go b/core/entity/device_push_config.pb.go
diff --git a/core/entity/device_push_identifier.pb.go b/core/entity/device_push_identifier.pb.go
diff --git a/core/entity/envelope.pb.go b/core/entity/envelope.pb.go
diff --git a/core/entity/err.pb.go b/core/entity/err.pb.go
diff --git a/core/entity/event.pb.go b/core/entity/event.pb.go
diff --git a/core/entity/kind.pb.go b/core/entity/kind.pb.go
diff --git a/core/entity/local_record.pb.go b/core/entity/local_record.pb.go
diff --git a/core/entity/message.pb.go b/core/entity/message.pb.go
diff --git a/core/entity/sender_alias.pb.go b/core/entity/sender_alias.pb.go
diff --git a/core/entity/void.pb.go b/core/entity/void.pb.go
diff --git a/core/pkg/deviceinfo/application.pb.go b/core/pkg/deviceinfo/application.pb.go
diff --git a/core/pkg/deviceinfo/deviceinfo.pb.go b/core/pkg/deviceinfo/deviceinfo.pb.go
diff --git a/core/pkg/errorcodes/errors.pb.go b/core/pkg/errorcodes/errors.pb.go
diff --git a/core/pkg/validate/validate.pb.go b/core/pkg/validate/validate.pb.go