Merge branch 'master+ZODB4-wc2' into y/wc2-next
* master+ZODB4-wc2: (112 commits) ninja: make sure it's built using SlapOS Python proxysql: stop using old CMake version up: proxysql 2.3.2 proxysql: bundled libinjection needs Python 2 proxysql: small clean up proxysql: clean up extends libiconv, libmicrohttpd, proxysql: make parts shared java-jdk: simplify a little fixup! component/nxdtest: v↑ (namespaces, /tmp-on-tmpfs, cancellation) erp5 and erp5testnode: add software-type to software.cfg.json so that it works in panel GUI Revert "component/libxml2: Version up" Revert "component/meson: Version up" software/theia: Fix EPR5 resiliency test component/libxml2: Version up component/meson: Version up component/m4: Version up erp5: Change default timerserver-interval from 5s to 1s. slapos/obs.cfg: supports the newer version of cmmi and add some comments pyprog: Wrap entry-point call with sys.exit() Generalize how nxdtest python script is generated into pyprog recipe macro ...
Showing
.husky/.gitignore
0 → 100644
.husky/pre-commit
0 → 100755
component/theia/buildout.cfg
0 → 100644
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
This source diff could not be displayed because it is too large. You can view the blob instead.
{ | ||
"dependencies": { | ||
"husky": "^1.1.2", | ||
"lint-staged": "^7.3.0" | ||
}, | ||
"lint-staged": { | ||
"*.json": [ | ||
"python2 ./format-json", | ||
"git add" | ||
"./format-json" | ||
], | ||
"{component,software,stack}/**": [ | ||
"python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"python2\", \"./update-hash\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'", | ||
"python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"./update-hash\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'", | ||
"python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"git\", \"add\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'" | ||
] | ||
}, | ||
"husky": { | ||
"hooks": { | ||
"pre-commit": "lint-staged" | ||
} | ||
"devDependencies": { | ||
"husky": "^7.0.0", | ||
"lint-staged": "^12.1.2" | ||
}, | ||
"scripts": { | ||
"prepare": "husky install && git config merge.tool update-hash-mergetool && git config mergetool.update-hash-mergetool.cmd './update-hash-mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"' && git config mergetool.update-hash-mergetool.trustExitCode true" | ||
} | ||
} |
This source diff could not be displayed because it is too large. You can view the blob instead.
File moved
File moved
File moved
Please register or sign in to comment