diff options
| author | Alexandre Flament <alex@al-f.net> | 2021-02-01 17:07:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 17:07:08 +0100 |
| commit | 99244440e42b970252b63fb1194ee1503afda704 (patch) | |
| tree | 201c9b183610c779a6285ad1333a67db4009886b | |
| parent | 0a8799b8348fb005389ede1fe85cce21dd51bea1 (diff) | |
| parent | 40d2a116e1e5a24027bba54de530fa9d4700cef3 (diff) | |
| download | searxng-99244440e42b970252b63fb1194ee1503afda704.tar.gz searxng-99244440e42b970252b63fb1194ee1503afda704.zip | |
Merge pull request #2514 from return42/fix-gh-pages
[fix] Makefile target gh-pages & flatten history of branch gh.pages
| -rw-r--r-- | .github/workflows/integration.yml | 2 | ||||
| -rw-r--r-- | utils/makefile.sphinx | 26 |
2 files changed, 13 insertions, 15 deletions
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 39f3d3418..7d0b97447 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -80,7 +80,7 @@ jobs: with: GITHUB_TOKEN: ${{ github.token }} BRANCH: gh-pages - FOLDER: gh-pages + FOLDER: build/gh-pages CLEAN: true # Automatically remove deleted files from the deploy branch dockers: diff --git a/utils/makefile.sphinx b/utils/makefile.sphinx index e73686466..c0f39e87d 100644 --- a/utils/makefile.sphinx +++ b/utils/makefile.sphinx @@ -10,7 +10,7 @@ SPHINX_CONF ?= conf.py DOCS_FOLDER = ./docs DOCS_BUILD = ./$(LXC_ENV_FOLDER)build/docs DOCS_DIST = ./$(LXC_ENV_FOLDER)dist/docs -GH_PAGES ?= gh-pages +GH_PAGES ?= build/gh-pages BOOKS_FOLDER = ./docs BOOKS_DIST = ./$(LXC_ENV_FOLDER)dist/books @@ -172,24 +172,22 @@ PHONY += prepare-gh-pages prepare-gh-pages: cp -r $(DOCS_DIST)/* $(GH_PAGES)/ touch $(GH_PAGES)/.nojekyll - echo "<html><head><META http-equiv='refresh' content='0;URL=index.html'></head></html>" > $(GH_PAGES)/404.html - -PHONY += $(GH_PAGES) -$(GH_PAGES):: - $(MAKE) docs - [ -d "gh-pages/.git" ] || git clone $(GIT_URL) gh-pages - -cd $(GH_PAGES); git checkout gh-pages >/dev/null - -cd $(GH_PAGES); git pull - -cd $(GH_PAGES); ls -A | grep -v '.git$$' | xargs rm -rf + echo "<html><head><META http-equiv='refresh' content='0;URL=index.html'></head></html>" > $(GH_PAGES)/404.html + +PHONY += gh-pages +gh-pages: docs-clean docs + - git worktree remove -f $(GH_PAGES) || exit 0 + - git branch -D gh-pages || exit 0 + git worktree add --no-checkout $(GH_PAGES) master + cd $(GH_PAGES); git checkout --orphan gh-pages && git rm -rfq . $(MAKE) prepare-gh-pages cd $(GH_PAGES);\ git add --all . ;\ - git commit -m "gh-pages: updated" ;\ - git push origin gh-pages + git commit -q -m "make gh-pages: from $(shell git config --get remote.origin.url)@$(shell git rev-parse HEAD)" ;\ + git push -f origin gh-pages PHONY += travis-gh-pages -travis-gh-pages: - $(MAKE) docs +travis-gh-pages: docs-clean docs rm -Rf $(GH_PAGES) mkdir -p $(GH_PAGES) $(MAKE) prepare-gh-pages |