Gherkin Rule keyword and Protocol Buffer messages

.gitignore

@@ -2,6 +2,8 @@
 node_modules/
 _book/
 .idea/
+*.iml
+target/
 **/*/.release/
 cucumber_manyrepo_id_rsa
 cucumber_manyrepo_id_rsa.pub

.templates/java/Makefile

@@ -12,4 +12,4 @@ default: .built
 
 clean:
 	rm -rf target
-.PHONY: clean
+.PHONY: clean .built

Dockerfile.cucumber-build

@@ -5,9 +5,13 @@ FROM alpine:3.7
 
 WORKDIR /app
 
-RUN apk add --no-cache --update --upgrade alpine-sdk make bash maven openjdk8 diffutils jq python py-pip ruby ruby-dev perl perl-dev wget rsync go nodejs
+RUN apk add --no-cache --update --upgrade alpine-sdk make bash maven openjdk8 diffutils jq python py-pip ruby ruby-dev perl perl-dev wget rsync go nodejs unzip
 RUN npm install --global yarn
 RUN echo "gem: --no-document" > ~/.gemrc
 RUN gem install bundler io-console
 RUN pip install pipenv==8.3.2
 RUN curl --fail -L http://cpanmin.us/ > /usr/local/bin/cpanm && chmod +x /usr/local/bin/cpanm
+RUN curl --fail -L https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip > protoc-3.5.1-linux-x86_64.zip
+RUN unzip protoc-3.5.1-linux-x86_64.zip -d protoc-3.5.1
+RUN mv protoc-3.5.1/bin/protoc /usr/local/bin/protoc && chmod +rx /usr/local/bin/protoc
+RUN rm -rf protoc-3.5.1 protoc-3.5.1-linux-x86_64.zip

HACKING.md

@@ -23,6 +23,19 @@ You can learn more about monorepos here:
 * http://danluu.com/monorepo/
 * https://medium.com/@bebraw/the-case-for-monorepos-907c1361708a
 
+### Branching and CI
+
+The CI build will synchronise from the monorepo to all the subrepos for the `master` branch.
+For other branches, a naming convention is used to decide what subrepos to sync to. 
+(This is to avoid an explosion of unrelated branches in every subrepo).
+
+For example, if you're making a change to `gherkin` on a branch, prefix the branch
+with `gherkin`, for example `gherkin-upgrade-dependencies`.
+
+Occasionally you want to sync to multiple subrepos. For example, if you are making changes
+in two modules (say `messages` and `gherkin`), prefix the branch with both module names, 
+separated by an underscore. For example, `messages_gherkin-use-protobuf`.
+
 ### Adding a new subrepo
 
 Occasionally, a sub directory is promoted to a separate subrepo. The process for doing this is:
@@ -60,13 +73,14 @@ In the new directory, create the following files:
 
 #### Create new subrepo.
 
-Create a new, empty subrepo at GitHub.
+Create a new, empty subrepo at GitHub. Check the box for initialising
+with a README - it's needed to create an initial `master` branch to push to.
 
 Log into Travis and set up build for the new (empty) subrepo.
 
 Initialise the subrepo, for example:
 
-    echo "[email protected]:cucumber/tag-expressions-go.git" > tag-expressions/go/.subrepo
+    echo "cucumber/tag-expressions-go.git" > tag-expressions/go/.subrepo
 
 Push to the subrepo:
 

Makefile

@@ -1,6 +1,7 @@
 SHELL := /usr/bin/env bash
-MAKEFILES=event-protocol/Makefile \
-  gherkin/Makefile \
+MAKEFILES=messages/Makefile \
+	event-protocol/Makefile \
+	gherkin/Makefile \
 	datatable/Makefile \
 	config/Makefile \
 	event-protocol/Makefile \

config/java/Makefile

@@ -12,4 +12,4 @@ default: .built
 
 clean:
 	rm -rf target
-.PHONY: clean
+.PHONY: clean .built

cucumber-expressions/java/Makefile

@@ -12,4 +12,4 @@ default: .built
 
 clean:
 	rm -rf target
-.PHONY: clean
+.PHONY: clean .built

datatable/java/Makefile

@@ -12,4 +12,4 @@ default: .built
 
 clean:
 	rm -rf target
-.PHONY: clean
+.PHONY: clean .built

gherkin/Makefile

@@ -3,7 +3,6 @@ MAKEFILES=dotnet/Makefile go/Makefile java/Makefile javascript/Makefile ruby/Mak
 # implement https://github.com/cucumber/cucumber/pull/353
 # MAKEFILES=$(wildcard */Makefile)
 EVENT_FILES = $(wildcard testdata/**/*.ndjson)
-SCHEMAS = $(wildcard ../event-protocol/schemas/*.json)
 
 default: $(patsubst %/Makefile,default-%,$(MAKEFILES))
 .PHONY: default
@@ -16,10 +15,3 @@ clean: $(patsubst %/Makefile,clean-%,$(MAKEFILES))
 
 clean-%: %
 	cd $< && make clean
-
-validate-events: .valid-events
-.PHONY: validate-events
-
-.valid-events: $(EVENT_FILES) $(SCHEMAS)
-	@cat $(EVENT_FILES) | node ../event-protocol/bin/cucumber-event-validator.js
-	touch $@