From ba6b9caf9ad8cc938e11898fe93eb24a730707fc Mon Sep 17 00:00:00 2001 From: Dominik Moritz Date: Mon, 4 Apr 2022 17:51:41 -0400 Subject: [PATCH] ci: don't skip the ci when we have automatic commits (#8089) --- scripts/check-and-commit-toc.sh | 2 +- scripts/check-and-commit.sh | 6 +++--- scripts/deploy-schema.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/check-and-commit-toc.sh b/scripts/check-and-commit-toc.sh index 5db4c95919..17a4fe988a 100755 --- a/scripts/check-and-commit-toc.sh +++ b/scripts/check-and-commit-toc.sh @@ -25,7 +25,7 @@ if ! git diff --exit-code ./site/_includes/docs_toc.md then if [ "$PUSH_BRANCH" = true ]; then git add site/_includes/docs_toc.md site/Gemfile.lock - git commit -m "chore: update TOC [ci skip]" + git commit -m "chore: update TOC [CI]" # Push all the TOC changes git pull --rebase diff --git a/scripts/check-and-commit.sh b/scripts/check-and-commit.sh index 1cf7bc7e1c..2212938cd4 100755 --- a/scripts/check-and-commit.sh +++ b/scripts/check-and-commit.sh @@ -24,7 +24,7 @@ echo "" if ! git diff --exit-code ./build/vega-lite-schema.json; then if [ "$PUSH_BRANCH" = true ]; then git add ./build/vega-lite-schema.json - git commit -m "chore: update schema [ci skip]" + git commit -m "chore: update schema [CI]" else echo "Outdated schema." exit 1 @@ -49,7 +49,7 @@ git add examples if [ "$PUSH_BRANCH" = true ]; then if ! git diff --cached --word-diff=color --exit-code examples; then - git commit -m "chore: update examples [ci skip]" + git commit -m "chore: update examples [CI]" fi else # Don't diff SVG as floating point calculation is not always consistent @@ -66,7 +66,7 @@ echo "" if [ "$PUSH_BRANCH" = true ]; then if ! git diff --exit-code site src test test-runtime; then git add --all - git commit -m "style: auto-formatting [ci skip]" + git commit -m "style: auto-formatting [CI]" fi # should be empty diff --git a/scripts/deploy-schema.sh b/scripts/deploy-schema.sh index bd5444d402..6ace408830 100755 --- a/scripts/deploy-schema.sh +++ b/scripts/deploy-schema.sh @@ -26,7 +26,7 @@ done if [ -n "$(git status --porcelain)" ]; then # Note: git commands need single quotes for all the files and directories with wildcards git add '*.json' - git commit -m"Add Vega-Lite $version [ci skip]" + git commit -m"Add Vega-Lite $version [CI]" git push else echo "Nothing has changed"