diff options
| -rw-r--r-- | README | 30 | ||||
| -rwxr-xr-x | tor_build-0.2.8.sh | 33 |
2 files changed, 48 insertions, 15 deletions
@@ -168,44 +168,44 @@ Currently, the following path has the repo branches up to 0.2.6.x: /home/makerpm/TorBuildRepos/Tor.git.rpm-release-allbranches - 1) Merging for 0.2.5 release, 0.2.5.N is the new tag the RPM is built for: + 1) Merging for 0.2.6 release, 0.2.6.N is the new tag the RPM is built for: - git checkout rpm-release-0.2.5 + git checkout rpm-release-0.2.6 git fetch tpo "refs/tags/*:refs/tags/*" - git pull tpo refs/tags/tor-0.2.5.N - git tag -v tor-0.2.5.N + git pull tpo refs/tags/tor-0.2.6.N + git tag -v tor-0.2.6.N # make changes like editing tor.spec.in # commit, build and check the built RPMs, push back to 'rpm-tor' # Sign the correct rpm-tor tag if everything looks ok, push it - git tag -s -u "0x8D62BB1E" -m "Tagging RPM for Tor 0.2.5.N" "rpm-tor-0.2.5.N-alpha" + git tag -s -u "0x8D62BB1E" -m "Tagging RPM for Tor 0.2.6.N" "rpm-tor-0.2.6.N-alpha" git push # check if fast-forwardable (fix previous tag locally if something failed) git push --tags # Sign RPMs, create repo structure, test, upload - 2) Merging for 0.2.6 release, 0.2.6.N is the new tag the RPM is built for: + 2) Merging for 0.2.7 release, 0.2.7.N is the new tag the RPM is built for: - git checkout rpm-release-0.2.6 + git checkout rpm-release-0.2.7 git fetch tpo "refs/tags/*:refs/tags/*" - git pull tpo refs/tags/tor-0.2.6.N - git tag -v tor-0.2.6.N + git pull tpo refs/tags/tor-0.2.7.N + git tag -v tor-0.2.7.N # make changes like editing tor.spec.in # commit, build and check the built RPMs, push back to 'rpm-tor' # Sign the correct rpm-tor tag if everything looks ok, push it - git tag -s -u "0x8D62BB1E" -m "Tagging RPM for Tor 0.2.6.N" "rpm-tor-0.2.6.N-alpha" + git tag -s -u "0x8D62BB1E" -m "Tagging RPM for Tor 0.2.7.N" "rpm-tor-0.2.7.N-alpha" git push # check if fast-forwardable (fix previous tag locally if something failed) git push --tags # Sign RPMs, create repo structure, test, upload - 3) Merging for 0.2.7 release, 0.2.7.N is the new tag the RPM is built for: + 3) Merging for 0.2.8 release, 0.2.8.N is the new tag the RPM is built for: - git checkout rpm-release-0.2.7 + git checkout rpm-release-0.2.8 git fetch tpo "refs/tags/*:refs/tags/*" - git pull tpo refs/tags/tor-0.2.7.N - git tag -v tor-0.2.7.N + git pull tpo refs/tags/tor-0.2.8.N + git tag -v tor-0.2.8.N # make changes like editing tor.spec.in # commit, build and check the built RPMs, push back to 'rpm-tor' # Sign the correct rpm-tor tag if everything looks ok, push it - git tag -s -u "0x8D62BB1E" -m "Tagging RPM for Tor 0.2.7.N" "rpm-tor-0.2.7.N-alpha" + git tag -s -u "0x8D62BB1E" -m "Tagging RPM for Tor 0.2.8.N" "rpm-tor-0.2.8.N-alpha" git push # check if fast-forwardable (fix previous tag locally if something failed) git push --tags # Sign RPMs, create repo structure, test, upload diff --git a/tor_build-0.2.8.sh b/tor_build-0.2.8.sh new file mode 100755 index 0000000..7c71004 --- /dev/null +++ b/tor_build-0.2.8.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +CONFIG_NAME="Build 0.2.8 branch" +CONFIG_BASE_FNAME="rpm-release-0.2.8" + +# directory where we can create some temp dirs +export WORKDIR="/home/makerpm/TorBuildWorkspace" +# existing unmodified cloned repo, doesn't have to be up-to-date +export CLEAN_GIT="/home/makerpm/TorBuildRepos/Tor.git.rpm-release-allbranches/" + +#perl-style regexp for grepping tags we are interested in +export WATCHED_TAG_RE='^rpm-tor-0\.2\.8\.\d+(-[^-]*)?$' + +# we created the rpm-tor-* tag +export VERIFY_TAG=no + +BUILD_SCRIPT="${0%/*}/tor_build.sh" +TIMESTAMP=$(date +'%Y-%m-%d_%H.%M.%S') +BUILD_LOG="$WORKDIR/$CONFIG_BASE_FNAME-$TIMESTAMP.log" #doesn't matter much it can be nonunique + +cat<<END +== Tor_build CONFIG: $CONFIG_NAME == + Settings: + + WORKDIR : '$WORKDIR' + CLEAN_GIT : '$CLEAN_GIT' + WATCHED_TAG_RE : '$WATCHED_TAG_RE' + +Exec'ing $BUILD_SCRIPT +Tee'ing output to $BUILD_LOG +END + +exec "$BUILD_SCRIPT" -p 2>&1 | tee "$BUILD_LOG" |