m

Author: ajewellamz

.github/workflows/library_format.yml

@@ -37,7 +37,6 @@ jobs:
 
       - name: Check format of Java code et al
         run: |
-          make setup_prettier
           make format_java_misc-check
 
       - name: Check format of Dafny code

CONTRIBUTING.md

@@ -31,9 +31,10 @@ To send us a pull request, please:
 1. Fork the repository.
 2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
 3. Ensure local tests pass.
-4. Commit to your fork using clear commit messages.
-5. Send us a pull request, answering any default questions in the pull request interface.
-6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
+4. Format the code. From the top level, run `make format_all`
+5. Commit to your fork using clear commit messages.
+6. Send us a pull request, answering any default questions in the pull request interface.
+7. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
 GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).

Makefile

@@ -22,6 +22,8 @@ duvet_report:
 		--source-pattern "DynamoDbEncryption/runtimes/java/src/main/java/**/*.java" \
 		--html specification_compliance_report.html
 
+format_all: format_dafny format_net format_java_misc
+
 format_dafny:
 	$(foreach PROJECT, $(PROJECTS), \
 		$(MAKE) -C $(PROJECT) format_dafny && \
@@ -42,10 +44,10 @@ format_net-check:
 		$(MAKE) -C $(PROJECT) format_net-check && \
 	) true
 
-format_java_misc:
+format_java_misc: setup_prettier
 	npx prettier --plugin=prettier-plugin-java . --write
 
-format_java_misc-check:
+format_java_misc-check: setup_prettier
 	npx prettier --plugin=prettier-plugin-java . --check
 
 setup_prettier: