From 89baae29ed7a8b302f2a7dc1dbf70263bd5817a4 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 25 Jan 2022 23:34:28 +0100 Subject: [PATCH] Testing with a manual doc deploy --- .github/workflows/github_action_build_docs.yml | 8 ++++---- docs/deploy.sh | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/github_action_build_docs.yml b/.github/workflows/github_action_build_docs.yml index 5bbea95c32..866d816bdc 100644 --- a/.github/workflows/github_action_build_docs.yml +++ b/.github/workflows/github_action_build_docs.yml @@ -44,16 +44,16 @@ jobs: - name: Set up evennia game dir run: | pip install -e . + pip install -r requirements_extra.txt cd .. evennia --init gamedir cd gamedir evennia migrate - - name: Deploy docs (only from master/develop branch) + - name: Build and deploy docs (only from master/develop branch) if: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'}} run: | git config --global user.email "docbuilder@evennia.com" - git config --global user.name "Doc builder mechanism" + git config --global user.name "Evennia docbuilder action" cd docs - make mv-local - make deploy + make release diff --git a/docs/deploy.sh b/docs/deploy.sh index 4cef12d872..9ab8706804 100644 --- a/docs/deploy.sh +++ b/docs/deploy.sh @@ -29,10 +29,9 @@ git add . git commit -a -m "Updated HTML docs" -# echo "Skipping deployment" git push origin gh-pages # get back to previous branch -# git checkout - +git checkout - echo "Deployed to https://evennia.github.io/evennia/"