From acc4f6b0b9668a925213b59a12301e53478dcbb6 Mon Sep 17 00:00:00 2001 From: Cameron Yick Date: Mon, 14 Feb 2022 22:32:25 -0500 Subject: [PATCH] chore: remove generating and tracking versions.yml from version control (#7983) --- .github/workflows/check.yml | 2 +- scripts/bump.sh | 3 +-- scripts/check-and-commit-toc.sh | 2 +- scripts/check-and-commit.sh | 6 +++--- scripts/deploy-schema.sh | 2 +- site/_data/versions.yml | 4 ---- 6 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 site/_data/versions.yml diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index cf00daf25e..5bbf017917 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -52,7 +52,7 @@ jobs: toc: name: TOC - if: "!contains(github.event.head_commit.message, '[CI]')" + if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ubuntu-latest steps: diff --git a/scripts/bump.sh b/scripts/bump.sh index 8a1b70a47b..54bcb9643f 100755 --- a/scripts/bump.sh +++ b/scripts/bump.sh @@ -20,8 +20,7 @@ set -x yarn version --new-version $1 --no-git-tag-version -yarn build:versions -git add site/_data/versions.yml package.json +git add package.json git commit -m "chore: release v$1" git tag -m "Release v$1." "v$1" diff --git a/scripts/check-and-commit-toc.sh b/scripts/check-and-commit-toc.sh index cbdf3a17b9..49128d8abe 100755 --- a/scripts/check-and-commit-toc.sh +++ b/scripts/check-and-commit-toc.sh @@ -24,7 +24,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]" + git commit -m "chore: update TOC [ci skip]" # Push all the TOC changes git pull --rebase diff --git a/scripts/check-and-commit.sh b/scripts/check-and-commit.sh index 60501308bb..a40e52e5c8 100755 --- a/scripts/check-and-commit.sh +++ b/scripts/check-and-commit.sh @@ -24,7 +24,7 @@ if ! git diff --exit-code ./build/vega-lite-schema.json; then ## Only do this for master if [ "$PUSH_BRANCH" = true ]; then git add ./build/vega-lite-schema.json - git commit -m "chore: update schema [CI]" + git commit -m "chore: update schema [ci skip]" 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]" + git commit -m "chore: update examples [ci skip]" 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]" + git commit -m "style: auto-formatting [ci skip]" fi # should be empty diff --git a/scripts/deploy-schema.sh b/scripts/deploy-schema.sh index dae8e2c5bb..b2be38a405 100755 --- a/scripts/deploy-schema.sh +++ b/scripts/deploy-schema.sh @@ -24,7 +24,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" + git commit -m"Add Vega-Lite $version [ci skip]" git push else echo "Nothing has changed" diff --git a/site/_data/versions.yml b/site/_data/versions.yml deleted file mode 100644 index 28e97ce5a1..0000000000 --- a/site/_data/versions.yml +++ /dev/null @@ -1,4 +0,0 @@ -vega: 5.21.0 -vega-lite: 5.2.0 -vega-embed: 6.20.5 -vega-tooltip: 0.27.0