From 6500266696af71a450e214f6542429a78af536e3 Mon Sep 17 00:00:00 2001 From: dgarcia360 Date: Wed, 5 Aug 2020 18:42:56 +0200 Subject: [PATCH 1/3] Change latest to version --- .github/workflows/pages.yml | 1 + docs/_utils/deploy.sh | 4 ++-- docs/_utils/redirect.html | 9 --------- docs/_utils/redirect.sh | 15 +++++++++++++++ docs/conf.py | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 docs/_utils/redirect.html create mode 100755 docs/_utils/redirect.sh diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 7467105c57..abc5a44b1c 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -28,3 +28,4 @@ jobs: run : ./docs/_utils/deploy.sh env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + LATEST_VERSION: 3.22.2-scylla diff --git a/docs/_utils/deploy.sh b/docs/_utils/deploy.sh index e912d303d8..63be58f0a2 100755 --- a/docs/_utils/deploy.sh +++ b/docs/_utils/deploy.sh @@ -3,8 +3,8 @@ # Clone repo git clone "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" --branch gh-pages --single-branch gh-pages cp -r docs/_build/dirhtml/* gh-pages -# Redirect index to master -cp docs/_utils/redirect.html gh-pages/index.html +# Redirect index to latest version +./docs/_utils/redirect.sh > gh-pages/index.html # Deploy cd gh-pages touch .nojekyll diff --git a/docs/_utils/redirect.html b/docs/_utils/redirect.html deleted file mode 100644 index 5731291d04..0000000000 --- a/docs/_utils/redirect.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - Redirecting to Driver - - - - - diff --git a/docs/_utils/redirect.sh b/docs/_utils/redirect.sh new file mode 100755 index 0000000000..e65b62cddc --- /dev/null +++ b/docs/_utils/redirect.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +latest=${LATEST_VERSION:='master'} + +cat <<- _EOF_ + + + + Redirecting to Driver + + + + + +_EOF_ diff --git a/docs/conf.py b/docs/conf.py index f24aaa377f..15bede67ef 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -231,7 +231,7 @@ # Whitelist pattern for tags (set to None to ignore all tags) smv_tag_whitelist = r'\b(3.22.0-scylla|3.21.0-scylla)\b' # Whitelist pattern for branches (set to None to ignore all branches) -smv_branch_whitelist = r"^master$" +smv_branch_whitelist = r"None" # Whitelist pattern for remotes (set to None to use local branches only) smv_remote_whitelist = r"^origin$" # Pattern for released versions From b1fa4a56a5422a7e4922c7edf37b7891e722ee91 Mon Sep 17 00:00:00 2001 From: dgarcia360 Date: Wed, 5 Aug 2020 18:44:41 +0200 Subject: [PATCH 2/3] Fix conf --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 15bede67ef..3d9adbfc67 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -231,7 +231,7 @@ # Whitelist pattern for tags (set to None to ignore all tags) smv_tag_whitelist = r'\b(3.22.0-scylla|3.21.0-scylla)\b' # Whitelist pattern for branches (set to None to ignore all branches) -smv_branch_whitelist = r"None" +smv_branch_whitelist = "None" # Whitelist pattern for remotes (set to None to use local branches only) smv_remote_whitelist = r"^origin$" # Pattern for released versions From ac9a413d9b44c5e08b875136f336b7125a57880d Mon Sep 17 00:00:00 2001 From: dgarcia360 Date: Wed, 5 Aug 2020 18:56:15 +0200 Subject: [PATCH 3/3] Fix latest --- .github/workflows/pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index abc5a44b1c..ba49002864 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -28,4 +28,4 @@ jobs: run : ./docs/_utils/deploy.sh env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - LATEST_VERSION: 3.22.2-scylla + LATEST_VERSION: 3.22.0-scylla