From 7447810e73554ca7ad44bd1bca4c289a1a8f92a7 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 00:03:02 -0600 Subject: [PATCH 01/25] first attempt at building docs on travis --- .travis.yml | 18 ++++++++++-------- Makefile | 25 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2a159426..d37eb6288 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,9 @@ ---- addons: - firefox: "latest" - + firefox: latest sudo: false language: node_js - node_js: -- '5.0.0' - +- 5.0.0 env: global: - DISPLAY=:99.0 @@ -19,6 +15,12 @@ env: sEQ0OSwK/9SUqLXB+w8n9oEdFEdLxZTBdMhC5fUrsCjgstfUSSgzYOT9cTFp awR42/q/Akos2eA8NWx5yU+hRC5rr+oQG5Eio0tzi9+y3a6VXDvgS1h2SaQz TR/MjA/29gFvV7bnp1LSs2TdZx+NGhLd4zHv01XZ+pQk/nQiW9w= - + - secure: LtFr+fbS9qHzNJyq9s2fCT085vuidM2lL7s55rHuoyrSyf2wc8Ei34yjT4gCT3hJZ/gQgS6ooXL3KHhZZNvqTiOKrYzgrC9zTyMUzIdfEZDS2hZJSdbr8C2I76z/a4BnP4QFV6z3cxpely9c98pP5i3sXgD3xWxT71n6MWiwe3I9aFbDaWULZXe+qmio6Tb0/yUhbnq5UPQb7VczAiRlPioGuEfarjixcSw7DqRCVFNwPhgZ9qUwo5bM3COXIU8Qfsk0QTtRL+75qr+gUWlDQL18cXb01a5LKDsMvNBWrVJxfqK2E5MW/BKfjDUn6tv9bHAZlRFQIv6700PvN1mFX/G9ZXyR2IdD90oXDogVxo0piJyc8GaXu5NKdk8bTTKJzv7UoFXoWJpltdSEzC7tDQTbqY1IA1ybeBliSLVbOXSn/JDd2clb9ilNB0o9/IO38qMJWcvZ6UOqKT7IZOtk43Jsudkks3fRiZoGNbM8hv1+okhkDdbGBmRme+1uGmc2Pff2rugQJlwVty6GXY3/tp4REeVrSsCtsL52dcMTYNtuadW21H27U66dt9REYkFi5jmuZFcWHvpLByXQ2UET3kmSJ1FPmveY3u63yXLrphN9Lqsu2Wg1kRGTfinTPuKmY8jQbhcK95mWAdgNaCDnFch4zzCd8svICSOfcTeQUPY= + - secure: AakAOjAe227DabsZu1rFsok5eS2dosd0cdkfp97k2qf/2QqxjdioU5kZFnw/y6glp9TsS5YGYcQqHjVlXPv9wyODyrfmsJx6lStxJxtiOsIzUZ/TjjwH2UrhOHKxDZrC1CAABiNrJ+ZVnR62CeH1L8OJz3nEyg6s0MfmF9jgL3qmuZBMH06sOUjmk7ldOxPO3dDvz3h6KkcIKfwcxALf8ZU1Zl1w0eGBkqy9l5gzEadgfnXqtzWQAUw5f+VypVBgpRYtExAmcbTt/RsUW12xEtRhnDJus7NW9Oag1Z1b1qkTEysX0jAgKK+oXFXg4Gohnl3+QqnRJWyGmEqDIXh0/dlzVcbAHkgRk74snmwYcwCX/B9654r6/kCs+Mf9NPVK1naVTD9JIGQQxA3iuzFlzZhn+FwdXIV5Ql9nI9OCeRZHLYHNawEkgQqAPgouaSZ0ljWfnIfQREM2GBCfT47wIJiQErFvgi/1JoTxociBzXkXR84aO+qn7oAJPz00t3ooiXafmBiC8onSJRIYuCtG0Q40DUK6/DtXchMQio0bRKMVYADhH82RQOyG/FFqoQVKxqEID6vA/r1ge98a/Bm75w37cn4j0T7gtaJwbsdPmlhzl7fHaVVuTIM0LcU9YSSZZ67Z0EdeROVtOVcwG5GMujapkt62iM4kj4UyqIr8+Oc= before_script: -- "sh -e /etc/init.d/xvfb start" +- sh -e /etc/init.d/xvfb start +after_success: +- make install-docfu +- git config user.email fineuploader-docs-bot@raynicholus.com +- git config user.name fineuploader-docs-bot +- make docs-travis diff --git a/Makefile b/Makefile index 17752a38e..18fc62463 100644 --- a/Makefile +++ b/Makefile @@ -404,6 +404,31 @@ copy-azure-jquery-dist: copy-all-dist: make copy-build-to-dist PUB-SUBDIR=all.fine-uploader +docs: + docfu --$(type) "$(type-value)" "FineUploader/fine-uploader" "docfu-temp" + git clone --depth 1 git@github.com:FineUploader/docs.fineuploader.com.git + cp -pR docfu-temp/$(type) docs.fineuploader.com/ + (cd docs.fineuploader.com ; git add . ; git commit -a -m "update docs for $(type) $(type-value)" ; git push https://${DOCS_PUSH_ACCESS_TOKEN}@github.com/FineUploader/docs.fineuploader.com.git) + rm -rf docs.fineuploader.com + rm -rf docfu-temp +.PHONY: docs + +docs-travis: +ifdef TRAVIS_TAG + make docs type=tag type-value=$(TRAVIS_TAG) +else ifdef TRAVIS_BRANCH + make docs type=branch type-value=$(TRAVIS_BRANCH) +else + @echo skipping docs build - not a non-PR or tag push +endif +.PHONY: docs-travis + +install-docfu: + git clone --depth 1 -b hotfix/cant-generate-docs-from-old-branches https://github.com/FineUploader/docfu + (cd docfu ; python setup.py install) + rm -rf docfu +.PHONY: install-docfu + tag-release: ifeq ($(simulate), true) @echo version is $(version) From 7283a4f1234be70414648406860e97c92e4c1973 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 00:09:23 -0600 Subject: [PATCH 02/25] sudo? --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d37eb6288..e2cd6aab0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ addons: firefox: latest -sudo: false +sudo: required language: node_js node_js: - 5.0.0 @@ -20,7 +20,7 @@ env: before_script: - sh -e /etc/init.d/xvfb start after_success: -- make install-docfu +- sudo make install-docfu - git config user.email fineuploader-docs-bot@raynicholus.com - git config user.name fineuploader-docs-bot - make docs-travis From d2c47db72c4375a7459db82ead4f7cdeb5878c3c Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 00:15:14 -0600 Subject: [PATCH 03/25] cleanup keys --- .travis.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2cd6aab0..7892ba616 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,16 +7,7 @@ node_js: env: global: - DISPLAY=:99.0 - - secure: |- - AZ/GEWzykeSzxh+4r14eKq2dMQnZyEvx99zFnTSp30Ke9QqJP3UQvMdwHzuV - 7jqjzHQUYMFl8o7VATMm7WeXiSURmzRP2F51W/v0rfhUyTo9BMiCxHmcI3up - wRMBtB4rJxzk3q5sUR32ucVs/fNlOCMC9M02fnSEijGw4Y+WOhc= - - secure: |- - sEQ0OSwK/9SUqLXB+w8n9oEdFEdLxZTBdMhC5fUrsCjgstfUSSgzYOT9cTFp - awR42/q/Akos2eA8NWx5yU+hRC5rr+oQG5Eio0tzi9+y3a6VXDvgS1h2SaQz - TR/MjA/29gFvV7bnp1LSs2TdZx+NGhLd4zHv01XZ+pQk/nQiW9w= - - secure: LtFr+fbS9qHzNJyq9s2fCT085vuidM2lL7s55rHuoyrSyf2wc8Ei34yjT4gCT3hJZ/gQgS6ooXL3KHhZZNvqTiOKrYzgrC9zTyMUzIdfEZDS2hZJSdbr8C2I76z/a4BnP4QFV6z3cxpely9c98pP5i3sXgD3xWxT71n6MWiwe3I9aFbDaWULZXe+qmio6Tb0/yUhbnq5UPQb7VczAiRlPioGuEfarjixcSw7DqRCVFNwPhgZ9qUwo5bM3COXIU8Qfsk0QTtRL+75qr+gUWlDQL18cXb01a5LKDsMvNBWrVJxfqK2E5MW/BKfjDUn6tv9bHAZlRFQIv6700PvN1mFX/G9ZXyR2IdD90oXDogVxo0piJyc8GaXu5NKdk8bTTKJzv7UoFXoWJpltdSEzC7tDQTbqY1IA1ybeBliSLVbOXSn/JDd2clb9ilNB0o9/IO38qMJWcvZ6UOqKT7IZOtk43Jsudkks3fRiZoGNbM8hv1+okhkDdbGBmRme+1uGmc2Pff2rugQJlwVty6GXY3/tp4REeVrSsCtsL52dcMTYNtuadW21H27U66dt9REYkFi5jmuZFcWHvpLByXQ2UET3kmSJ1FPmveY3u63yXLrphN9Lqsu2Wg1kRGTfinTPuKmY8jQbhcK95mWAdgNaCDnFch4zzCd8svICSOfcTeQUPY= - - secure: AakAOjAe227DabsZu1rFsok5eS2dosd0cdkfp97k2qf/2QqxjdioU5kZFnw/y6glp9TsS5YGYcQqHjVlXPv9wyODyrfmsJx6lStxJxtiOsIzUZ/TjjwH2UrhOHKxDZrC1CAABiNrJ+ZVnR62CeH1L8OJz3nEyg6s0MfmF9jgL3qmuZBMH06sOUjmk7ldOxPO3dDvz3h6KkcIKfwcxALf8ZU1Zl1w0eGBkqy9l5gzEadgfnXqtzWQAUw5f+VypVBgpRYtExAmcbTt/RsUW12xEtRhnDJus7NW9Oag1Z1b1qkTEysX0jAgKK+oXFXg4Gohnl3+QqnRJWyGmEqDIXh0/dlzVcbAHkgRk74snmwYcwCX/B9654r6/kCs+Mf9NPVK1naVTD9JIGQQxA3iuzFlzZhn+FwdXIV5Ql9nI9OCeRZHLYHNawEkgQqAPgouaSZ0ljWfnIfQREM2GBCfT47wIJiQErFvgi/1JoTxociBzXkXR84aO+qn7oAJPz00t3ooiXafmBiC8onSJRIYuCtG0Q40DUK6/DtXchMQio0bRKMVYADhH82RQOyG/FFqoQVKxqEID6vA/r1ge98a/Bm75w37cn4j0T7gtaJwbsdPmlhzl7fHaVVuTIM0LcU9YSSZZ67Z0EdeROVtOVcwG5GMujapkt62iM4kj4UyqIr8+Oc= + - secure: JC5ts+0e0nXiDmM0cCWdSGh0Pc+3QllhMK2wjLtsywIB+X6f8olUIY/sFVMScOu6+cK6GTvJTqtMPRGuZtIYajIUPqQkWzlGkaXbzGUsDMlCzSuOGj933unKBYZ1IxsWqxLtJP63OvMwcGMRndlIIzhIiwYI8kY4ZFRrmZPoxj+3RlBq+Wwtf0G1zZcrnX0WNOfRoz+4HWrhoiWW5sOgTkdsqrzW/RmOcSVuErAME/TEbA5CFg3mjaeNT2cR7TIgOnBhIgUVxfllVup0q7FtrHQ7Y/KGfxvIByJisvXvQUgA7iTCkiEIoC1edg/JJiNm79tosnhEYphi/pTwRH2UnUgAMLq3pm1CPPhaLqDVBxfvMVBih/ZxUGPs5v1PMzp0edHJsYQuYLeTogwN3XplO5E2us62JHK0TdTWibxdl9Vbexa5a9qbYT8IMp9d/jzmDF0yupOxb/XBpV4adWXq1XlDJ+Z+sHlu8YX309cwSI/kFGct4DdYT2r77IbwgrIO1J03lK5m7D2SMsdbYelk/Y+DjI5Lf1Vry6gmo2em4TG91nd5a67MeGpUL9a3xewGricm15GSAqN9YvdYipN43cyUyWVlfOrUd1v+SlwS+KjR6BypEKFT64aumvY95VURMbRhEOJMANltP6mMjtSpMa+IJmZYutg9r4OAp4xUzn0= before_script: - sh -e /etc/init.d/xvfb start after_success: From a94e66cc93527c59bf90efeb4719937fc7676411 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 00:40:50 -0600 Subject: [PATCH 04/25] travis-ci is a tire fire --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7892ba616..8d2c3f144 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ node_js: env: global: - DISPLAY=:99.0 + # fineuploader-docs-bot access token: - secure: JC5ts+0e0nXiDmM0cCWdSGh0Pc+3QllhMK2wjLtsywIB+X6f8olUIY/sFVMScOu6+cK6GTvJTqtMPRGuZtIYajIUPqQkWzlGkaXbzGUsDMlCzSuOGj933unKBYZ1IxsWqxLtJP63OvMwcGMRndlIIzhIiwYI8kY4ZFRrmZPoxj+3RlBq+Wwtf0G1zZcrnX0WNOfRoz+4HWrhoiWW5sOgTkdsqrzW/RmOcSVuErAME/TEbA5CFg3mjaeNT2cR7TIgOnBhIgUVxfllVup0q7FtrHQ7Y/KGfxvIByJisvXvQUgA7iTCkiEIoC1edg/JJiNm79tosnhEYphi/pTwRH2UnUgAMLq3pm1CPPhaLqDVBxfvMVBih/ZxUGPs5v1PMzp0edHJsYQuYLeTogwN3XplO5E2us62JHK0TdTWibxdl9Vbexa5a9qbYT8IMp9d/jzmDF0yupOxb/XBpV4adWXq1XlDJ+Z+sHlu8YX309cwSI/kFGct4DdYT2r77IbwgrIO1J03lK5m7D2SMsdbYelk/Y+DjI5Lf1Vry6gmo2em4TG91nd5a67MeGpUL9a3xewGricm15GSAqN9YvdYipN43cyUyWVlfOrUd1v+SlwS+KjR6BypEKFT64aumvY95VURMbRhEOJMANltP6mMjtSpMa+IJmZYutg9r4OAp4xUzn0= before_script: - sh -e /etc/init.d/xvfb start From 1581160c50afc4dfe2306e493c9fffcfa9dad845 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 00:58:58 -0600 Subject: [PATCH 05/25] permissions issue --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 18fc62463..61fc2a7d4 100644 --- a/Makefile +++ b/Makefile @@ -406,7 +406,7 @@ copy-all-dist: docs: docfu --$(type) "$(type-value)" "FineUploader/fine-uploader" "docfu-temp" - git clone --depth 1 git@github.com:FineUploader/docs.fineuploader.com.git + git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ (cd docs.fineuploader.com ; git add . ; git commit -a -m "update docs for $(type) $(type-value)" ; git push https://${DOCS_PUSH_ACCESS_TOKEN}@github.com/FineUploader/docs.fineuploader.com.git) rm -rf docs.fineuploader.com From 8645d9b4834fb811234f34f845050d47cf8ad599 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 01:04:29 -0600 Subject: [PATCH 06/25] whoami? --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d2c3f144..263df3498 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,6 @@ before_script: - sh -e /etc/init.d/xvfb start after_success: - sudo make install-docfu -- git config user.email fineuploader-docs-bot@raynicholus.com -- git config user.name fineuploader-docs-bot +- git config --global user.email "fineuploader-docs-bot@raynicholus.com" +- git config --global user.name "fineuploader-docs-bot - make docs-travis From ef20d8488b42e738afbb4b3b9c9765466d97284c Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 01:11:10 -0600 Subject: [PATCH 07/25] damnit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 263df3498..9bcfbc1b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,5 @@ before_script: after_success: - sudo make install-docfu - git config --global user.email "fineuploader-docs-bot@raynicholus.com" -- git config --global user.name "fineuploader-docs-bot +- git config --global user.name "fineuploader-docs-bot" - make docs-travis From 03baa4b7871e72d23fd6415377c6d1112ff2fe91 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 01:17:11 -0600 Subject: [PATCH 08/25] wrong var expand --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 61fc2a7d4..30f285122 100644 --- a/Makefile +++ b/Makefile @@ -408,7 +408,7 @@ docs: docfu --$(type) "$(type-value)" "FineUploader/fine-uploader" "docfu-temp" git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ - (cd docs.fineuploader.com ; git add . ; git commit -a -m "update docs for $(type) $(type-value)" ; git push https://${DOCS_PUSH_ACCESS_TOKEN}@github.com/FineUploader/docs.fineuploader.com.git) + (cd docs.fineuploader.com ; git add . ; git commit -a -m "update docs for $(type) $(type-value)" ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@github.com/FineUploader/docs.fineuploader.com.git) rm -rf docs.fineuploader.com rm -rf docfu-temp .PHONY: docs From 7d2eff2405d2798227bedecb1af0b81e065520e3 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 09:10:02 -0600 Subject: [PATCH 09/25] weong access token repo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9bcfbc1b5..68291fb91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: global: - DISPLAY=:99.0 # fineuploader-docs-bot access token: - - secure: JC5ts+0e0nXiDmM0cCWdSGh0Pc+3QllhMK2wjLtsywIB+X6f8olUIY/sFVMScOu6+cK6GTvJTqtMPRGuZtIYajIUPqQkWzlGkaXbzGUsDMlCzSuOGj933unKBYZ1IxsWqxLtJP63OvMwcGMRndlIIzhIiwYI8kY4ZFRrmZPoxj+3RlBq+Wwtf0G1zZcrnX0WNOfRoz+4HWrhoiWW5sOgTkdsqrzW/RmOcSVuErAME/TEbA5CFg3mjaeNT2cR7TIgOnBhIgUVxfllVup0q7FtrHQ7Y/KGfxvIByJisvXvQUgA7iTCkiEIoC1edg/JJiNm79tosnhEYphi/pTwRH2UnUgAMLq3pm1CPPhaLqDVBxfvMVBih/ZxUGPs5v1PMzp0edHJsYQuYLeTogwN3XplO5E2us62JHK0TdTWibxdl9Vbexa5a9qbYT8IMp9d/jzmDF0yupOxb/XBpV4adWXq1XlDJ+Z+sHlu8YX309cwSI/kFGct4DdYT2r77IbwgrIO1J03lK5m7D2SMsdbYelk/Y+DjI5Lf1Vry6gmo2em4TG91nd5a67MeGpUL9a3xewGricm15GSAqN9YvdYipN43cyUyWVlfOrUd1v+SlwS+KjR6BypEKFT64aumvY95VURMbRhEOJMANltP6mMjtSpMa+IJmZYutg9r4OAp4xUzn0= + - secure: VivYvunE/CR/eHQIWjE4sqgj9ZFydBj/+5l78ivyWxxdqyeUyuDx8Nv3ZpmYyCBU/V9g9FCXxlGmnQrF41ibIST/V0ogW0k2SkI+8onZogmoqDpYjuwgsj0IcbmIviY6NtQ88B4VaL9ynQKMBSAfKUuiL1okqoLHnfyPN33UdBk= before_script: - sh -e /etc/init.d/xvfb start after_success: From 9244a276ff2794b364bb92b6419da2bb63f77b13 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 10:08:12 -0600 Subject: [PATCH 10/25] auth madness --- .travis.yml | 3 ++- Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68291fb91..0f819d29f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,9 @@ node_js: env: global: - DISPLAY=:99.0 + - DOCS_GH_REF: github.com/FineUploader/docs.fineuploader.com # fineuploader-docs-bot access token: - - secure: VivYvunE/CR/eHQIWjE4sqgj9ZFydBj/+5l78ivyWxxdqyeUyuDx8Nv3ZpmYyCBU/V9g9FCXxlGmnQrF41ibIST/V0ogW0k2SkI+8onZogmoqDpYjuwgsj0IcbmIviY6NtQ88B4VaL9ynQKMBSAfKUuiL1okqoLHnfyPN33UdBk= + - secure: nDapj/IyKyPhcD6eHWqd3YnydZ3AHZDeiuAxgBOiYllSZ5AxlTahET0MX58rRp+8RsvNCZ4EBbEQ2u7I4JoqAwGyx8LhwA0q64ZQ7xI7RSHttgN289Xt4V4NEjUv1ObJgRxfXKqMbpHvU+0CVGdXunB4inconN6dOIXfGsq4HaM= before_script: - sh -e /etc/init.d/xvfb start after_success: diff --git a/Makefile b/Makefile index 30f285122..5b029c295 100644 --- a/Makefile +++ b/Makefile @@ -408,7 +408,7 @@ docs: docfu --$(type) "$(type-value)" "FineUploader/fine-uploader" "docfu-temp" git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ - (cd docs.fineuploader.com ; git add . ; git commit -a -m "update docs for $(type) $(type-value)" ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@github.com/FineUploader/docs.fineuploader.com.git) + @(cd docs.fineuploader.com ; git add . ; git commit -a -m "update docs for $(type) $(type-value)" ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF) rm -rf docs.fineuploader.com rm -rf docfu-temp .PHONY: docs From 9975c5efa9ed8629bf8aaa20bb52daa668cdac4e Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 11:19:57 -0600 Subject: [PATCH 11/25] bracket madness --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5b029c295..c04c1b215 100644 --- a/Makefile +++ b/Makefile @@ -408,7 +408,7 @@ docs: docfu --$(type) "$(type-value)" "FineUploader/fine-uploader" "docfu-temp" git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ - @(cd docs.fineuploader.com ; git add . ; git commit -a -m "update docs for $(type) $(type-value)" ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF) + @(cd docs.fineuploader.com ; git add . ; git commit -a -m "update docs for $(type) $(type-value)" ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)) rm -rf docs.fineuploader.com rm -rf docfu-temp .PHONY: docs From 12abf4449adce3888eb44e4d899dfab219cb391e Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 17:04:06 -0600 Subject: [PATCH 12/25] skip docs generation if build fails --- .travis.yml | 8 +++----- Makefile | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f819d29f..c7244f849 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,6 @@ env: - secure: nDapj/IyKyPhcD6eHWqd3YnydZ3AHZDeiuAxgBOiYllSZ5AxlTahET0MX58rRp+8RsvNCZ4EBbEQ2u7I4JoqAwGyx8LhwA0q64ZQ7xI7RSHttgN289Xt4V4NEjUv1ObJgRxfXKqMbpHvU+0CVGdXunB4inconN6dOIXfGsq4HaM= before_script: - sh -e /etc/init.d/xvfb start -after_success: -- sudo make install-docfu -- git config --global user.email "fineuploader-docs-bot@raynicholus.com" -- git config --global user.name "fineuploader-docs-bot" -- make docs-travis +script: +- npm test +- if [ $TRAVIS_TEST_RESULT -eq 0 ]; make docs-travis; fi diff --git a/Makefile b/Makefile index c04c1b215..bda739df4 100644 --- a/Makefile +++ b/Makefile @@ -414,6 +414,9 @@ docs: .PHONY: docs docs-travis: + sudo make install-docfu + git config --global user.email "fineuploader-docs-bot@raynicholus.com" + git config --global user.name "fineuploader-docs-bot" ifdef TRAVIS_TAG make docs type=tag type-value=$(TRAVIS_TAG) else ifdef TRAVIS_BRANCH From ab717db1095cd5ce2b8f042b87030a2e119f312b Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 17:12:08 -0600 Subject: [PATCH 13/25] fail build if docs generation fails + remove sudo --- .travis.yml | 15 ++++++++++----- Makefile | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7244f849..c469dd31f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,22 @@ addons: firefox: latest -sudo: required -language: node_js -node_js: -- 5.0.0 +sudo: false +language: python +python: +- 2.7 env: global: - DISPLAY=:99.0 - DOCS_GH_REF: github.com/FineUploader/docs.fineuploader.com # fineuploader-docs-bot access token: - secure: nDapj/IyKyPhcD6eHWqd3YnydZ3AHZDeiuAxgBOiYllSZ5AxlTahET0MX58rRp+8RsvNCZ4EBbEQ2u7I4JoqAwGyx8LhwA0q64ZQ7xI7RSHttgN289Xt4V4NEjUv1ObJgRxfXKqMbpHvU+0CVGdXunB4inconN6dOIXfGsq4HaM= +install: + - . $HOME/.nvm/nvm.sh + - nvm install stable + - nvm use 5.0.0 + - npm install before_script: - sh -e /etc/init.d/xvfb start script: - npm test -- if [ $TRAVIS_TEST_RESULT -eq 0 ]; make docs-travis; fi +- if [ $TRAVIS_TEST_RESULT -eq 0 ]; make docs-travis; fi; diff --git a/Makefile b/Makefile index bda739df4..da6a7f875 100644 --- a/Makefile +++ b/Makefile @@ -414,7 +414,7 @@ docs: .PHONY: docs docs-travis: - sudo make install-docfu + make install-docfu git config --global user.email "fineuploader-docs-bot@raynicholus.com" git config --global user.name "fineuploader-docs-bot" ifdef TRAVIS_TAG From dbbe4f79027e308f575ac9d5c1c12a8e7fbd25d5 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 17:13:28 -0600 Subject: [PATCH 14/25] bad nvm use/install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c469dd31f..e63dfa0c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: - secure: nDapj/IyKyPhcD6eHWqd3YnydZ3AHZDeiuAxgBOiYllSZ5AxlTahET0MX58rRp+8RsvNCZ4EBbEQ2u7I4JoqAwGyx8LhwA0q64ZQ7xI7RSHttgN289Xt4V4NEjUv1ObJgRxfXKqMbpHvU+0CVGdXunB4inconN6dOIXfGsq4HaM= install: - . $HOME/.nvm/nvm.sh - - nvm install stable + - nvm install 5.0.0 - nvm use 5.0.0 - npm install before_script: From a5c01dfab0b2acc6aec8969aa3e8b649fb60eb5c Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 17:17:21 -0600 Subject: [PATCH 15/25] badif --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e63dfa0c5..a59608035 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,4 @@ before_script: - sh -e /etc/init.d/xvfb start script: - npm test -- if [ $TRAVIS_TEST_RESULT -eq 0 ]; make docs-travis; fi; +- if [ $TRAVIS_TEST_RESULT -eq 0 ]; then make docs-travis; fi From 42a310891f2b8958894849e7e2d5baac2ae74503 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 17:23:50 -0600 Subject: [PATCH 16/25] don't update docs in PR build --- Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index da6a7f875..5b63c11d6 100644 --- a/Makefile +++ b/Makefile @@ -404,7 +404,9 @@ copy-azure-jquery-dist: copy-all-dist: make copy-build-to-dist PUB-SUBDIR=all.fine-uploader -docs: +docs: install-docfu + git config --global user.email "fineuploader-docs-bot@raynicholus.com" + git config --global user.name "fineuploader-docs-bot" docfu --$(type) "$(type-value)" "FineUploader/fine-uploader" "docfu-temp" git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ @@ -414,15 +416,12 @@ docs: .PHONY: docs docs-travis: - make install-docfu - git config --global user.email "fineuploader-docs-bot@raynicholus.com" - git config --global user.name "fineuploader-docs-bot" -ifdef TRAVIS_TAG +ifneq ($(TRAVIS_PULL_REQUEST), false) + @echo skipping docs build - not a non-PR or tag push +else ifdef TRAVIS_TAG make docs type=tag type-value=$(TRAVIS_TAG) -else ifdef TRAVIS_BRANCH - make docs type=branch type-value=$(TRAVIS_BRANCH) else - @echo skipping docs build - not a non-PR or tag push + make docs type=branch type-value=$(TRAVIS_BRANCH) endif .PHONY: docs-travis From 4867fa63cd6648faf62ba14beb7e76b3c40b2657 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 17:47:42 -0600 Subject: [PATCH 17/25] copy master branch docs to root of docs repo if master build --- Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5b63c11d6..d6c259faf 100644 --- a/Makefile +++ b/Makefile @@ -410,11 +410,23 @@ docs: install-docfu docfu --$(type) "$(type-value)" "FineUploader/fine-uploader" "docfu-temp" git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ - @(cd docs.fineuploader.com ; git add . ; git commit -a -m "update docs for $(type) $(type-value)" ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)) - rm -rf docs.fineuploader.com - rm -rf docfu-temp + @(/ + cd docs.fineuploader.com ;/ + git add . ;/ + git commit -a -m "update docs for $(type) $(type-value)" ;/ + git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)/ + ) + make maybe-update-root-docs .PHONY: docs +maybe-update-root-docs: +ifndef TRAVIS_TAG +ifeq ($(TRAVIS_BRANCH), master) + cp -pR docs.fineuploader.com/branch/master/ docs.fineuploader.com/ +endif +endif +.PHONY: maybe-update-root-docs + docs-travis: ifneq ($(TRAVIS_PULL_REQUEST), false) @echo skipping docs build - not a non-PR or tag push From 5495a0a4a88d2d7b8a3d0d59eb03ab955841bd6f Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 17:52:07 -0600 Subject: [PATCH 18/25] CR madness --- Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d6c259faf..dabf48079 100644 --- a/Makefile +++ b/Makefile @@ -410,12 +410,9 @@ docs: install-docfu docfu --$(type) "$(type-value)" "FineUploader/fine-uploader" "docfu-temp" git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ - @(/ - cd docs.fineuploader.com ;/ - git add . ;/ - git commit -a -m "update docs for $(type) $(type-value)" ;/ - git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)/ - ) + (cd docs.fineuploader.com ; git add) + (cd docs.fineuploader.com ; git commit -a -m "update docs for $(type) $(type-value)") + (cd docs.fineuploader.com ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)) make maybe-update-root-docs .PHONY: docs From a94c0b4305a7862b19c78b5f8a5415988e7d7ea7 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 18:00:01 -0600 Subject: [PATCH 19/25] git add syntax error --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dabf48079..ed6d0ad2f 100644 --- a/Makefile +++ b/Makefile @@ -410,7 +410,7 @@ docs: install-docfu docfu --$(type) "$(type-value)" "FineUploader/fine-uploader" "docfu-temp" git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ - (cd docs.fineuploader.com ; git add) + (cd docs.fineuploader.com ; git add .) (cd docs.fineuploader.com ; git commit -a -m "update docs for $(type) $(type-value)") (cd docs.fineuploader.com ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)) make maybe-update-root-docs From 2745589e17274a6b17c76a741fafc56dd3ec9158 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 18:15:42 -0600 Subject: [PATCH 20/25] idk --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ed6d0ad2f..c7be22447 100644 --- a/Makefile +++ b/Makefile @@ -412,8 +412,8 @@ docs: install-docfu cp -pR docfu-temp/$(type) docs.fineuploader.com/ (cd docs.fineuploader.com ; git add .) (cd docs.fineuploader.com ; git commit -a -m "update docs for $(type) $(type-value)") - (cd docs.fineuploader.com ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)) - make maybe-update-root-docs + @(cd docs.fineuploader.com ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)) + make maybe-update-root-docs .PHONY: docs maybe-update-root-docs: From 7c54840c8afc37088a48f7d10c25a038da6d23b8 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 22:13:05 -0600 Subject: [PATCH 21/25] don't exit with error code 1 if there are no docs changes to commit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c7be22447..1994b290b 100644 --- a/Makefile +++ b/Makefile @@ -411,7 +411,7 @@ docs: install-docfu git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ (cd docs.fineuploader.com ; git add .) - (cd docs.fineuploader.com ; git commit -a -m "update docs for $(type) $(type-value)") + (cd docs.fineuploader.com ; git diff --cached --quiet || git commit -a -m "update docs for $(type) $(type-value)") @(cd docs.fineuploader.com ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)) make maybe-update-root-docs .PHONY: docs From a054e9f22befc637c4a780a9e935507f04fab16b Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 22:16:23 -0600 Subject: [PATCH 22/25] test doc create --- docs/index.jmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.jmd b/docs/index.jmd index 0a81c8604..ee1fa43be 100644 --- a/docs/index.jmd +++ b/docs/index.jmd @@ -8,7 +8,7 @@ for help on upgrading from a 4.x version.""" )}} -# Documentation Overview {: .page-header } +# FOOBAR Overview {: .page-header } Welcome to Fine Uploader's documentation. This documentation is divided into different parts. It's recommended that you first check out the From cbf8be6e208e3a3a9d252020d0ccdf0481448c54 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 22:19:04 -0600 Subject: [PATCH 23/25] Revert "don't exit with error code 1 if there are no docs changes to commit" This reverts commit 7c54840c8afc37088a48f7d10c25a038da6d23b8. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1994b290b..c7be22447 100644 --- a/Makefile +++ b/Makefile @@ -411,7 +411,7 @@ docs: install-docfu git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ (cd docs.fineuploader.com ; git add .) - (cd docs.fineuploader.com ; git diff --cached --quiet || git commit -a -m "update docs for $(type) $(type-value)") + (cd docs.fineuploader.com ; git commit -a -m "update docs for $(type) $(type-value)") @(cd docs.fineuploader.com ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)) make maybe-update-root-docs .PHONY: docs From eed1ad508336848cba34ad8204b200aece50d92b Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 22:23:44 -0600 Subject: [PATCH 24/25] don't exit with error code 1 if there are no docs changes to commit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c7be22447..1994b290b 100644 --- a/Makefile +++ b/Makefile @@ -411,7 +411,7 @@ docs: install-docfu git clone --depth 1 https://github.com/FineUploader/docs.fineuploader.com.git cp -pR docfu-temp/$(type) docs.fineuploader.com/ (cd docs.fineuploader.com ; git add .) - (cd docs.fineuploader.com ; git commit -a -m "update docs for $(type) $(type-value)") + (cd docs.fineuploader.com ; git diff --cached --quiet || git commit -a -m "update docs for $(type) $(type-value)") @(cd docs.fineuploader.com ; git push https://$(DOCS_PUSH_ACCESS_TOKEN)@$(DOCS_GH_REF)) make maybe-update-root-docs .PHONY: docs From 314dc48e5e8dc8e842ea3490e254726214aff949 Mon Sep 17 00:00:00 2001 From: Ray Nicholus Date: Tue, 21 Feb 2017 22:24:31 -0600 Subject: [PATCH 25/25] revert docs create test --- docs/index.jmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.jmd b/docs/index.jmd index ee1fa43be..0a81c8604 100644 --- a/docs/index.jmd +++ b/docs/index.jmd @@ -8,7 +8,7 @@ for help on upgrading from a 4.x version.""" )}} -# FOOBAR Overview {: .page-header } +# Documentation Overview {: .page-header } Welcome to Fine Uploader's documentation. This documentation is divided into different parts. It's recommended that you first check out the