summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-02-22 22:57:55 +0100
committerHolger Levsen <holger@layer-acht.org>2015-02-22 22:57:55 +0100
commit5c840c2b6cfb689b5113d664a95d8b0cac69efc2 (patch)
tree31c2a9b71e233017ab7c54b5eb21b963f00950ae
parent59c757e0319fc03667b933d2d609dda0a0d19147 (diff)
downloadjenkins.debian.net-5c840c2b6cfb689b5113d664a95d8b0cac69efc2.tar.xz
new URL: https://jenkins.debian.net/userContent/contributing.html
-rw-r--r--TODO3
-rwxr-xr-xupdate_jdn.sh5
2 files changed, 4 insertions, 4 deletions
diff --git a/TODO b/TODO
index 582120b3..df681349 100644
--- a/TODO
+++ b/TODO
@@ -10,7 +10,7 @@ ToDo for jenkins.debian.net
== About jenkins.debian.net
-See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian.net"] for a general description of the setup. Below is the current TODO list, which is long and probably incomplete too. The best way to contribute is to actually send patches via pull requests.
+See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian.net"] for a general description of the setup. Below is the current TODO list, which is long and probably incomplete too. The links:https://jenkins.debian.net/userContent/contributing.html[the preferred form of contributions] are patches via pull requests.
== Fix user submitted bugs
@@ -18,7 +18,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
== General ToDo
-* build, deploy and link CONTRIBUTING from TODO
* replace amd64 in scripts with $HOSTARCH
* put kgb-client.conf in git and sed passwords from filesystem into it...
* set up a dedicated mailinglist, or maybe even two, one for discussion and one for commits.
diff --git a/update_jdn.sh b/update_jdn.sh
index 9b38c96f..50ff845e 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -196,7 +196,7 @@ cd $BASEDIR
cp --preserve=mode,timestamps -r bin logparse job-cfg features live /srv/jenkins/
cp procmailrc /var/lib/jenkins/.procmailrc
explain "Jenkins updated."
-cp -pr README INSTALL TODO d-i-preseed-cfgs /var/lib/jenkins/userContent/
+cp -pr README INSTALL TODO CONTRIBUTING d-i-preseed-cfgs /var/lib/jenkins/userContent/
TMPFILE=$(mktemp)
git log | grep ^Author| cut -d " " -f2-|sort -u > $TMPFILE
echo "----" >> $TMPFILE
@@ -208,9 +208,10 @@ ASCIIDOC_PARAMS="-a numbered -a data-uri -a iconsdir=/etc/asciidoc/images/icons
[ about.html -nt README ] || asciidoc $ASCIIDOC_PARAMS -o about.html README
[ todo.html -nt TODO ] || asciidoc $ASCIIDOC_PARAMS -o todo.html TODO
[ setup.html -nt INSTALL ] || asciidoc $ASCIIDOC_PARAMS -o setup.html INSTALL
+[ contributing.html -nt CONTRIBUTING ] || asciidoc $ASCIIDOC_PARAMS -o contributing.html CONTRIBUTING
diff THANKS .THANKS >/dev/null || asciidoc $ASCIIDOC_PARAMS -o thanks.html THANKS
mv THANKS .THANKS
-rm TODO README INSTALL
+rm TODO README INSTALL CONTRIBUTING
chown -R jenkins.jenkins /var/lib/jenkins/userContent
explain "Updated user content for Jenkins."