git.iko.soy/searx
on master help sign in
Merge pull request #2514 from return42/fix-gh-pages
9924444Alexandre Flament
.github/workflows/integration.yml+1−1
compare with master
unifiedsplit
@@ -80,7 +80,7 @@ jobs:
80 with:
80 with:
81 GITHUB_TOKEN: ${{ github.token }}
81 GITHUB_TOKEN: ${{ github.token }}
82 BRANCH: gh-pages
82 BRANCH: gh-pages
83− FOLDER: gh-pages
83+ FOLDER: build/gh-pages
84 CLEAN: true # Automatically remove deleted files from the deploy branch
84 CLEAN: true # Automatically remove deleted files from the deploy branch
85
85
86 dockers:
86 dockers:
utils/makefile.sphinx+12−14
@@ -10,7 +10,7 @@ SPHINX_CONF ?= conf.py
10DOCS_FOLDER = ./docs
10DOCS_FOLDER = ./docs
11DOCS_BUILD = ./$(LXC_ENV_FOLDER)build/docs
11DOCS_BUILD = ./$(LXC_ENV_FOLDER)build/docs
12DOCS_DIST = ./$(LXC_ENV_FOLDER)dist/docs
12DOCS_DIST = ./$(LXC_ENV_FOLDER)dist/docs
13−GH_PAGES ?= gh-pages
13+GH_PAGES ?= build/gh-pages
14
14
15BOOKS_FOLDER = ./docs
15BOOKS_FOLDER = ./docs
16BOOKS_DIST = ./$(LXC_ENV_FOLDER)dist/books
16BOOKS_DIST = ./$(LXC_ENV_FOLDER)dist/books
@@ -172,24 +172,22 @@ PHONY += prepare-gh-pages
172prepare-gh-pages:
172prepare-gh-pages:
173 cp -r $(DOCS_DIST)/* $(GH_PAGES)/
173 cp -r $(DOCS_DIST)/* $(GH_PAGES)/
174 touch $(GH_PAGES)/.nojekyll
174 touch $(GH_PAGES)/.nojekyll
175− echo "<html><head><META http-equiv='refresh' content='0;URL=index.html'></head></html>" > $(GH_PAGES)/404.html
175+ echo "<html><head><META http-equiv='refresh' content='0;URL=index.html'></head></html>" > $(GH_PAGES)/404.html
176−
176+
177−PHONY += $(GH_PAGES)
177+PHONY += gh-pages
178−$(GH_PAGES)::
178+gh-pages: docs-clean docs
179− $(MAKE) docs
179+ - git worktree remove -f $(GH_PAGES) || exit 0
180− [ -d "gh-pages/.git" ] || git clone $(GIT_URL) gh-pages
180+ - git branch -D gh-pages || exit 0
181− -cd $(GH_PAGES); git checkout gh-pages >/dev/null
181+ git worktree add --no-checkout $(GH_PAGES) master
182− -cd $(GH_PAGES); git pull
183− -cd $(GH_PAGES); ls -A | grep -v '.git$$' | xargs rm -rf
182+ cd $(GH_PAGES); git checkout --orphan gh-pages && git rm -rfq .
184 $(MAKE) prepare-gh-pages
183 $(MAKE) prepare-gh-pages
185 cd $(GH_PAGES);\
184 cd $(GH_PAGES);\
186 git add --all . ;\
185 git add --all . ;\
187− git commit -m "gh-pages: updated" ;\
186+ git commit -q -m "make gh-pages: from $(shell git config --get remote.origin.url)@$(shell git rev-parse HEAD)" ;\
188− git push origin gh-pages
187+ git push -f origin gh-pages
189
188
190PHONY += travis-gh-pages
189PHONY += travis-gh-pages
191−travis-gh-pages:
190+travis-gh-pages: docs-clean docs
192− $(MAKE) docs
193 rm -Rf $(GH_PAGES)
191 rm -Rf $(GH_PAGES)
194 mkdir -p $(GH_PAGES)
192 mkdir -p $(GH_PAGES)
195 $(MAKE) prepare-gh-pages
193 $(MAKE) prepare-gh-pages