From f52dd2b8f7555bf197101214361614bd0eaf00a5 Mon Sep 17 00:00:00 2001 From: Philipp Hansch Date: Wed, 25 Jul 2018 22:49:25 +0200 Subject: [PATCH 1/2] Further automate pre_publish.sh --- pre_publish.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pre_publish.sh b/pre_publish.sh index aca17b968..d8a9105c6 100755 --- a/pre_publish.sh +++ b/pre_publish.sh @@ -17,7 +17,13 @@ git commit -m "Bump the version" set +e +echo "Running \`cargo fmt\`.." + cd clippy_lints && cargo fmt -- --write-mode=overwrite && cd .. cargo fmt -- --write-mode=overwrite -echo "remember to add a git tag and running 'cargo test' before committing the rustfmt changes" +echo "Running tests to make sure \`cargo fmt\` did not break anything.." + +cargo test + +echo "If the tests passed, review and commit the formatting changes and remember to add a git tag." From 559b2f871f9907eab4be3cc58e118ff37a5468d0 Mon Sep 17 00:00:00 2001 From: Philipp Hansch Date: Thu, 30 Aug 2018 07:33:53 +0200 Subject: [PATCH 2/2] Remove git diffing part Because we no bump versions --- pre_publish.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pre_publish.sh b/pre_publish.sh index d8a9105c6..3602f671e 100755 --- a/pre_publish.sh +++ b/pre_publish.sh @@ -4,13 +4,6 @@ set -e ./util/update_lints.py -git status --short | sort | grep -v README.md | grep -v helper.txt | sort > helper.txt - -# abort if the files differ -diff "publish.files" "helper.txt" - -rm helper.txt - # add all changed files git add . git commit -m "Bump the version"