From 41d18b94273a635004b1869206fc14f5eed8ad1d Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Fri, 5 Jun 2020 22:30:34 +0900 Subject: [PATCH 1/7] Update sphinx-build.yml --- .github/workflows/sphinx-build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sphinx-build.yml b/.github/workflows/sphinx-build.yml index d6ead835..f11b7575 100644 --- a/.github/workflows/sphinx-build.yml +++ b/.github/workflows/sphinx-build.yml @@ -29,9 +29,8 @@ jobs: git add . git commit -m "Update documentation" -a || true - - name: Push changes - uses: ad-m/github-push-action@master + - name: Deploy + uses: peaceiris/actions-gh-pages@v3 with: - branch: gh-pages - directory: gh-pages github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: ./docs/build/html From 9be4cb16ddef81fd040e27ca495c87b010634af0 Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Fri, 5 Jun 2020 22:35:08 +0900 Subject: [PATCH 2/7] Update sphinx-build.yml --- .github/workflows/sphinx-build.yml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/.github/workflows/sphinx-build.yml b/.github/workflows/sphinx-build.yml index f11b7575..ba6f22d6 100644 --- a/.github/workflows/sphinx-build.yml +++ b/.github/workflows/sphinx-build.yml @@ -2,32 +2,20 @@ name: "Pull Request Docs Check" on: pull_request: - branches: [ master ] - + branches: + - master jobs: - docs: runs-on: ubuntu-latest steps: - - - name: Setup the environment - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Create the new documentation uses: ammaraskar/sphinx-action@master with: - docs-folder: "doc/" - - - name: Commit documentation changes - run: | - git clone https://github.com/mathLab/EZyRB.git --branch gh-pages --single-branch gh-pages - cp -r docs/build/html/* gh-pages/ - cd gh-pages - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - git add . - git commit -m "Update documentation" -a || true + pre-build-command: "python -m pip install pip sphinx_rtd_theme numpy scipy GPy matplotlib -U" + docs-folder: "docs/" - name: Deploy uses: peaceiris/actions-gh-pages@v3 From 4abea032abdb52760b791e3c6db7909f170d12ba Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Fri, 5 Jun 2020 22:42:13 +0900 Subject: [PATCH 3/7] Update index.rst --- docs/source/index.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/source/index.rst b/docs/source/index.rst index 44cd5e0e..051b4f7a 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -8,6 +8,7 @@ Welcome to EZyRB's documentation! Easy Reduced Basis method. +test by peaceiris Description ^^^^^^^^^^^^ From 1b2f09acd1f5eb459c4ca7d0a56a528e79f27d1c Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Fri, 5 Jun 2020 22:49:10 +0900 Subject: [PATCH 4/7] Update sphinx-build.yml --- .github/workflows/sphinx-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sphinx-build.yml b/.github/workflows/sphinx-build.yml index ba6f22d6..7a0d79af 100644 --- a/.github/workflows/sphinx-build.yml +++ b/.github/workflows/sphinx-build.yml @@ -7,7 +7,7 @@ on: jobs: docs: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 From 796e338c2f73ecd4433242b7e4b106d03bb4518f Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Fri, 5 Jun 2020 22:52:37 +0900 Subject: [PATCH 5/7] Update index.rst --- docs/source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 051b4f7a..0cc01c68 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -8,7 +8,7 @@ Welcome to EZyRB's documentation! Easy Reduced Basis method. -test by peaceiris +test No. 2 by peaceiris Description ^^^^^^^^^^^^ From e0d7a42c26d679d3d02d06559180c0e255814994 Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Fri, 5 Jun 2020 22:58:55 +0900 Subject: [PATCH 6/7] Update sphinx-build.yml --- .github/workflows/sphinx-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sphinx-build.yml b/.github/workflows/sphinx-build.yml index 7a0d79af..c1c07a44 100644 --- a/.github/workflows/sphinx-build.yml +++ b/.github/workflows/sphinx-build.yml @@ -20,5 +20,7 @@ jobs: - name: Deploy uses: peaceiris/actions-gh-pages@v3 with: - github_token: ${{ secrets.GITHUB_TOKEN }} + #github_token: ${{ secrets.GITHUB_TOKEN }} + deploy_key: ${{ secrets.DEPLOY_PRIVATE_KEY }} publish_dir: ./docs/build/html + allow_empty_commit: true From 62b5be9768b09ccc00be207ae1f94aef956e7567 Mon Sep 17 00:00:00 2001 From: Shohei Ueda <30958501+peaceiris@users.noreply.github.com> Date: Fri, 5 Jun 2020 23:21:56 +0900 Subject: [PATCH 7/7] Update sphinx-build.yml --- .github/workflows/sphinx-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sphinx-build.yml b/.github/workflows/sphinx-build.yml index c1c07a44..4bcfe0b8 100644 --- a/.github/workflows/sphinx-build.yml +++ b/.github/workflows/sphinx-build.yml @@ -24,3 +24,5 @@ jobs: deploy_key: ${{ secrets.DEPLOY_PRIVATE_KEY }} publish_dir: ./docs/build/html allow_empty_commit: true + user_name: 'github-actions[bot]' + user_email: 'github-actions[bot]@users.noreply.github.com'