Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: don't skip the ci when we have automatic commits #8089

Merged
merged 1 commit into from
Apr 4, 2022
Merged

ci: don't skip the ci when we have automatic commits #8089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/check-and-commit-toc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions scripts/check-and-commit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy-schema.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down