diff --git a/dev-tools/release/utils/check_release.py b/dev-tools/release/utils/check_release.py index 215b9421f843effad87683ea5115edb7d8029733..716334040688aa33f851503a42d0b14c41e78472 100644 --- a/dev-tools/release/utils/check_release.py +++ b/dev-tools/release/utils/check_release.py @@ -22,7 +22,7 @@ def check_tarball(): run_command(cmd) cmd = "cd %s/build; cmake -DCMAKE_INSTALL_PREFIX=../installed ../BornAgain-%s; make -j8; make check; make install" % (get_checktarball_dir(), get_version()) run_command(cmd) - cmd = "source %s/installed/bin/thisbornagain.sh; python -c \"from libBornAgainCore import *; print GetVersionNumber()\"" % (get_checktarball_dir()) + cmd = "cd %s/installed/lib; python -c \"from libBornAgainCore import *; print GetVersionNumber()\"" % (get_checktarball_dir()) print cmd result = subprocess.check_output(cmd, shell=True) received_version = result.split("\n")[0] diff --git a/dev-tools/release/utils/finalize_release.py b/dev-tools/release/utils/finalize_release.py index 4af9a47d46099502436d342b3bc71127fd28047d..2d18dcf4406f4eb9968c4ec69da10650b05cd888 100644 --- a/dev-tools/release/utils/finalize_release.py +++ b/dev-tools/release/utils/finalize_release.py @@ -20,7 +20,7 @@ def finalize_git(): run_command(cmd) # master branch - cmd = "cd %s; git checkout master" % get_source_dir() + cmd = "cd %s; git checkout master; git pull" % get_source_dir() run_command(cmd) cmd = "cd %s; git merge --no-ff %s -m \"Merge %s\"" % (get_source_dir(), get_branch_name(), get_version()) @@ -33,7 +33,7 @@ def finalize_git(): run_command(cmd) # develop branch - cmd = "cd %s; git checkout develop" % get_source_dir() + cmd = "cd %s; git checkout develop; git pull" % get_source_dir() run_command(cmd) cmd = "cd %s; git merge --no-ff %s -m \"Merge %s\"" % (get_source_dir(), get_branch_name(), get_version())