From cc1fbdfa6dff8349d8654af69659fb99d8baeeea Mon Sep 17 00:00:00 2001 From: James Eddy Date: Sun, 28 Apr 2019 17:23:59 +0100 Subject: [PATCH 1/4] modify 'fetchpages' script to preserve everything on current gh-pages --- scripts/fetchpages.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/fetchpages.sh b/scripts/fetchpages.sh index e92cbceec..2053efbdd 100644 --- a/scripts/fetchpages.sh +++ b/scripts/fetchpages.sh @@ -8,16 +8,6 @@ rm -rf .ghpages-tmp mkdir -p .ghpages-tmp cd .ghpages-tmp git clone --depth=1 --branch=gh-pages $REPO_URL . -if [ "$TRAVIS_BRANCH" == "master" ]; then cp -Rn . ../ -else -# in case it doesn't exist -mkdir -p preview -mkdir -p docs -mkdir -p swagger-ui -cp -Rn preview ../preview/ -cp -Rn docs ../docs/ -cp -Rn swagger-ui ../swagger-ui/ -fi cd .. rm -rf .ghpages-tmp From 29adb633921bf27ec818d04f44fd1a8d8ffeb505 Mon Sep 17 00:00:00 2001 From: James Eddy Date: Sun, 28 Apr 2019 17:29:59 +0100 Subject: [PATCH 2/4] update travis config to keep old docs --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 62a847b74..d8312557e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,8 @@ jobs: - "./scripts/stagepages.sh" deploy: provider: pages - skip-cleanup: true + skip_cleanup: true + keep_history: true github-token: $GITHUB_TOKEN on: all_branches: true From 7d50b2040efb4530e8bf86a623c221de2103d7b4 Mon Sep 17 00:00:00 2001 From: James Eddy Date: Sun, 28 Apr 2019 17:42:37 +0100 Subject: [PATCH 3/4] clean up folders that aren't needed after gh-pages deploy --- scripts/stagepages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/stagepages.sh b/scripts/stagepages.sh index b053a2039..a0bbbf79d 100644 --- a/scripts/stagepages.sh +++ b/scripts/stagepages.sh @@ -20,3 +20,5 @@ fi # do some cleanup, these cause the gh-pages deploy to break rm -rf node_modules +rm -rf web_deploy +rm -rf spec From 714b10ab9f23f87e7707457f01215418fa97f4ff Mon Sep 17 00:00:00 2001 From: James Eddy Date: Sun, 28 Apr 2019 18:06:21 +0100 Subject: [PATCH 4/4] fix bash typo in stagepages script --- scripts/stagepages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/stagepages.sh b/scripts/stagepages.sh index a0bbbf79d..29d6e5a83 100644 --- a/scripts/stagepages.sh +++ b/scripts/stagepages.sh @@ -5,7 +5,7 @@ set -v if [ "$TRAVIS_BRANCH" != "gh-pages" ]; then if [ "$TRAVIS_BRANCH" == "master" ]; then - branchpath = "." + branchpath="." else branch=$(echo "$TRAVIS_BRANCH" | awk '{print tolower($0)}') branchpath="preview/$branch"