devol
/
searx
mirror of https://github.com/searx/searx
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2514 from return42/fix-gh-pages 

[fix] Makefile target gh-pages & flatten history of branch gh.pages
This commit is contained in:
Alexandre Flament 2021-02-01 17:07:08 +01:00 committed by GitHub
parent 0a8799b834 40d2a116e1
commit 99244440e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/integration.yml vendored
View File

@ -80,7 +80,7 @@ jobs:
with: with:
GITHUB_TOKEN: ${{ github.token }} GITHUB_TOKEN: ${{ github.token }}
BRANCH: gh-pages BRANCH: gh-pages
FOLDER: gh-pages FOLDER: build/gh-pages
CLEAN: true # Automatically remove deleted files from the deploy branch CLEAN: true # Automatically remove deleted files from the deploy branch
dockers: dockers:

24
utils/makefile.sphinx
View File

@ -10,7 +10,7 @@ SPHINX_CONF ?= conf.py
DOCS_FOLDER = ./docs DOCS_FOLDER = ./docs
DOCS_BUILD = ./$(LXC_ENV_FOLDER)build/docs DOCS_BUILD = ./$(LXC_ENV_FOLDER)build/docs
DOCS_DIST = ./$(LXC_ENV_FOLDER)dist/docs DOCS_DIST = ./$(LXC_ENV_FOLDER)dist/docs
GH_PAGES ?= gh-pages GH_PAGES ?= build/gh-pages
BOOKS_FOLDER = ./docs BOOKS_FOLDER = ./docs
BOOKS_DIST = ./$(LXC_ENV_FOLDER)dist/books BOOKS_DIST = ./$(LXC_ENV_FOLDER)dist/books
@ -172,24 +172,22 @@ PHONY += prepare-gh-pages
prepare-gh-pages: prepare-gh-pages:
cp -r $(DOCS_DIST)/* $(GH_PAGES)/ cp -r $(DOCS_DIST)/* $(GH_PAGES)/
touch $(GH_PAGES)/.nojekyll touch $(GH_PAGES)/.nojekyll
echo "<html><head><META http-equiv='refresh' content='0;URL=index.html'></head></html>" > $(GH_PAGES)/404.html echo "<html><head><META http-equiv='refresh' content='0;URL=index.html'></head></html>" > $(GH_PAGES)/404.html
PHONY += $(GH_PAGES) PHONY += gh-pages
$(GH_PAGES):: gh-pages: docs-clean docs
$(MAKE) docs - git worktree remove -f $(GH_PAGES) || exit 0
[ -d "gh-pages/.git" ] || git clone $(GIT_URL) gh-pages - git branch -D gh-pages || exit 0
-cd $(GH_PAGES); git checkout gh-pages >/dev/null git worktree add --no-checkout $(GH_PAGES) master
-cd $(GH_PAGES); git pull cd $(GH_PAGES); git checkout --orphan gh-pages && git rm -rfq .
-cd $(GH_PAGES); ls -A | grep -v '.git$$' | xargs rm -rf
$(MAKE) prepare-gh-pages $(MAKE) prepare-gh-pages
cd $(GH_PAGES);\ cd $(GH_PAGES);\
git add --all . ;\ git add --all . ;\
git commit -m "gh-pages: updated" ;\ git commit -q -m "make gh-pages: from $(shell git config --get remote.origin.url)@$(shell git rev-parse HEAD)" ;\
git push origin gh-pages git push -f origin gh-pages
PHONY += travis-gh-pages PHONY += travis-gh-pages
travis-gh-pages: travis-gh-pages: docs-clean docs
$(MAKE) docs
rm -Rf $(GH_PAGES) rm -Rf $(GH_PAGES)
mkdir -p $(GH_PAGES) mkdir -p $(GH_PAGES)
$(MAKE) prepare-gh-pages $(MAKE) prepare-gh-pages