Commit 6df10fc2 authored by Dominik Charousset's avatar Dominik Charousset

Fix branch name check for building docs

parent 962b23a4
...@@ -359,12 +359,12 @@ pipeline { ...@@ -359,12 +359,12 @@ pipeline {
]], ]],
]) ])
sshagent(['84d71a75-cbb6-489a-8f4c-d0e2793201e9']) { sshagent(['84d71a75-cbb6-489a-8f4c-d0e2793201e9']) {
sh ''' sh """
if [ "$(cat branch.txt)" = "master" ]; then if [ "${env.GIT_BRANCH}" = "origin/master" ]; then
rsync -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" -r -z --delete build/doc/html/ www.inet.haw-hamburg.de:/users/www/www.actor-framework.org/html/doc rsync -e "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" -r -z --delete build/doc/html/ www.inet.haw-hamburg.de:/users/www/www.actor-framework.org/html/doc
scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null build/doc/manual.pdf www.inet.haw-hamburg.de:/users/www/www.actor-framework.org/html/pdf/manual.pdf scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null build/doc/manual.pdf www.inet.haw-hamburg.de:/users/www/www.actor-framework.org/html/pdf/manual.pdf
fi fi
''' """
} }
} }
dir('read-the-docs') { dir('read-the-docs') {
...@@ -372,20 +372,20 @@ pipeline { ...@@ -372,20 +372,20 @@ pipeline {
credentialsId: '9b054212-9bb4-41fd-ad8e-b7d47495303f', credentialsId: '9b054212-9bb4-41fd-ad8e-b7d47495303f',
url: 'git@github.com:actor-framework/read-the-docs.git', url: 'git@github.com:actor-framework/read-the-docs.git',
]) ])
sh ''' sh """
if [ "$(cat ../caf-sources/branch.txt)" = "master" ]; then if [ "${env.GIT_BRANCH}" = "origin/master" ]; then
cp ../caf-sources/build/doc/rst/* . cp ../caf-sources/build/doc/rst/* .
if [ -n "$(git status --porcelain)" ]; then if [ -n "\$(git status --porcelain)" ]; then
git add . git add .
git commit -m "Update Manual" git commit -m "Update Manual"
git push --set-upstream origin master git push --set-upstream origin master
if [ -z "$(grep 'exp.sha' ../caf-sources/release.txt)" ] ; then if [ -z "\$(grep 'exp.sha' ../caf-sources/release.txt)" ] ; then
git tag $(cat ../caf-sources/release.txt) git tag \$(cat ../caf-sources/release.txt)
git push origin $(cat ../caf-sources/release.txt) git push origin \$(cat ../caf-sources/release.txt)
fi fi
fi fi
fi fi
''' """
} }
} }
} }
......
#!/bin/sh #!/bin/sh
grep "define CAF_VERSION" libcaf_core/caf/config.hpp | awk '{printf "%d.%d.%d", int($3 / 10000), int($3 / 100) % 100, $3 % 100}' > version.txt grep "define CAF_VERSION" libcaf_core/caf/config.hpp | awk '{printf "%d.%d.%d", int($3 / 10000), int($3 / 100) % 100, $3 % 100}' > version.txt
git rev-parse --abbrev-ref HEAD > branch.txt
git log --pretty=format:%h -n 1 > sha.txt git log --pretty=format:%h -n 1 > sha.txt
if test "$(cat branch.txt) = master" && git describe --tags --contains $(cat sha.txt) 1>tag.txt 2>/dev/null ; then if test "$(cat branch.txt) = master" && git describe --tags --contains $(cat sha.txt) 1>tag.txt 2>/dev/null ; then
cp tag.txt release.txt cp tag.txt release.txt
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment