diff --git a/project.clj b/project.clj index fb6d0ea55090db181323eafbbfd5dacd96dac4bb..0bc56f6a0c72ceea5e72f670238d94f0f2017c51 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject python/lein-template "1.5.2" +(defproject python/lein-template "1.5.3" :description "lein template for a python project" :url "https://blog.emacsos.com/python-project-template" :license {:name "Eclipse Public License" diff --git a/src/leiningen/new/python.clj b/src/leiningen/new/python.clj index 613e5561938b29db99a199146b5ebd95d0ab494c..e3269eedea2bf47475208be2382df971fa5aa73d 100644 --- a/src/leiningen/new/python.clj +++ b/src/leiningen/new/python.clj @@ -54,7 +54,7 @@ "utils/versionutils.py" "utils/build-deb" "utils/install-git-hooks" - "utils/trigger-jenkins-build" + "utils/trigger-ci-build" "deb-scripts/before-install.sh" "deb-scripts/after-install.sh" "deb-scripts/before-remove.sh" diff --git a/src/leiningen/new/python/README-dev.rst b/src/leiningen/new/python/README-dev.rst index 895485da6eb8a4d130d51658f27e914318672909..335163d2e6555ab88b83ce4c9e8f5f4d9d171a4b 100644 --- a/src/leiningen/new/python/README-dev.rst +++ b/src/leiningen/new/python/README-dev.rst @@ -84,3 +84,11 @@ How to run tests and deploy projects other environment, the app.yaml template should be updated to fit in the environment. +How to add git commit hooks etc +--------------------------------- + +Using git pre-commit hook is a good idea. + +.. code-block:: bash + + make install-git-hooks diff --git a/src/leiningen/new/python/git-hooks/post-commit b/src/leiningen/new/python/git-hooks/post-commit index 9f9d2b3c57e88b63bcb423a4f7c556413039c20b..6806d0eaf5541c268d2be7b55fb1dd579beece3c 100755 --- a/src/leiningen/new/python/git-hooks/post-commit +++ b/src/leiningen/new/python/git-hooks/post-commit @@ -1,3 +1,3 @@ #!/bin/sh -./utils/trigger-jenkins-build +./utils/trigger-ci-build diff --git a/src/leiningen/new/python/git-hooks/post-merge b/src/leiningen/new/python/git-hooks/post-merge index 9f9d2b3c57e88b63bcb423a4f7c556413039c20b..6806d0eaf5541c268d2be7b55fb1dd579beece3c 100755 --- a/src/leiningen/new/python/git-hooks/post-merge +++ b/src/leiningen/new/python/git-hooks/post-merge @@ -1,3 +1,3 @@ #!/bin/sh -./utils/trigger-jenkins-build +./utils/trigger-ci-build diff --git a/src/leiningen/new/python/utils/trigger-ci-build b/src/leiningen/new/python/utils/trigger-ci-build new file mode 100755 index 0000000000000000000000000000000000000000..58053682e0780ff3da5786a90eb6f961c8364d11 --- /dev/null +++ b/src/leiningen/new/python/utils/trigger-ci-build @@ -0,0 +1,4 @@ +#!/bin/sh + +# you can trigger a CI build in this script. +# nowadays most CI trigger a build themselves when you push commits to server. diff --git a/src/leiningen/new/python/utils/trigger-jenkins-build b/src/leiningen/new/python/utils/trigger-jenkins-build deleted file mode 100755 index c482e2189781043833d963e0e64d020223aa136b..0000000000000000000000000000000000000000 --- a/src/leiningen/new/python/utils/trigger-jenkins-build +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -URL='http://localhost:50010/job/{{name}}/build?delay=0sec' - -echo "Run Jenkins build at $URL" -curl "$URL"