forked from Ponysearch/Ponysearch
PonySearch is a fork SearXNG which is a free internet metasearch engine which aggregates results from various search services and databases. Users are neither tracked nor profiled.
0606cde105
The idea is to avoid conflict when there are differents branches with changes are made on the static files.
A solution is to ask the administrators to build the files from the sources, but it requires to install the npm dependencies.
So the solution in this commit keep the sources and the build files in the same git repository.
In one branch, the modification of the source (*.less, *.js) are commited without the built files.
The built files are commited in a uniq commit, with a commit message "Static build"
In case of merge or rebase, this commit can be dropped.
New make targets:
* static.build.commit.drop:
drop the last "Static build".
The command checks that there are only build files in the commit.
* static.build.commit :
call "make static.build.commit.drop"
call "make themes.all"
commit the files
* static.git.restore.staged:
git restore --staged <build files>
* static.git.restore:
git restore <build files>
Related to https://github.com/searxng/searxng/issues/137
|
||
|---|---|---|
| .github | ||
| dockerfiles | ||
| docs | ||
| examples | ||
| searx | ||
| searx_extra | ||
| tests | ||
| utils | ||
| .config.sh | ||
| .coveragerc | ||
| .dir-locals.el | ||
| .dockerignore | ||
| .gitattributes | ||
| .gitignore | ||
| .pylintrc | ||
| .yamllint.yml | ||
| AUTHORS.rst | ||
| babel.cfg | ||
| CHANGELOG.rst | ||
| CONTRIBUTING.md | ||
| Dockerfile | ||
| LICENSE | ||
| Makefile | ||
| manage | ||
| PULL_REQUEST_TEMPLATE.md | ||
| README.rst | ||
| requirements-dev.txt | ||
| requirements.txt | ||
| setup.py | ||
.. SPDX-License-Identifier: AGPL-3.0-or-later |searx install| |searx homepage| |searx wiki| |AGPL License| |Issues| |commits| Privacy-respecting, hackable `metasearch engine`_ .. _metasearch engine: https://en.wikipedia.org/wiki/Metasearch_engine .. |searx install| image:: https://img.shields.io/badge/-install-blue :target: https://searxng.github.io/searxng/admin/installation.html .. |searx homepage| image:: https://img.shields.io/badge/-homepage-blue :target: https://searxng.github.io/searxng .. |searx wiki| image:: https://img.shields.io/badge/-wiki-blue :target: https://github.com/searxng/searxng/wiki .. |AGPL License| image:: https://img.shields.io/badge/license-AGPL-blue.svg :target: https://github.com/searxng/searxng/blob/master/LICENSE .. |Issues| image:: https://img.shields.io/github/issues/searxng/searxng?color=yellow&label=issues :target: https://github.com/searxng/searxng/issues .. |PR| image:: https://img.shields.io/github/issues-pr-raw/searxng/searxng?color=yellow&label=PR :target: https://github.com/searxng/searxng/pulls .. |commits| image:: https://img.shields.io/github/commit-activity/y/searxng/searxng?color=yellow&label=commits :target: https://github.com/searxng/searxng/commits/master If you are looking for running instances, ready to use, then visit searx.space_. Otherwise jump to the user_, admin_ and developer_ handbooks you will find on our homepage_. .. _searx.space: https://searx.space .. _user: https://searxng.github.io/searxng/user .. _admin: https://searxng.github.io/searxng/admin .. _developer: https://searxng.github.io/searxng/dev .. _homepage: https://searxng.github.io/searxng