mirror of
https://github.com/searxng/searxng.git
synced 2024-11-05 09:00:02 +00:00
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
|
||
|---|---|---|
| .. | ||
| templates | ||
| brand.env | ||
| build_env.py | ||
| filtron.sh | ||
| lib.sh | ||
| lxc-searx.env | ||
| lxc.sh | ||
| makefile.include | ||
| makefile.lxc | ||
| manage_static.sh | ||
| morty.sh | ||
| searx.sh | ||