August 2019 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'tor-github/pr/1215'
by nickm＠torproject.org 24 Aug '19

24 Aug '19

commit 7a45c9c1d2a9632c6f029460d9a9cc514ea8b9ed Merge: f1707f7db d6202d312 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 24 16:30:55 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1215' changes/ticket29879 | 7 +++++++ scripts/git/git-push-all.sh | 51 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 9 deletions(-)

1 0

[tor/master] scripts/git: add TOR_PUSH_DELAY to git-push-all.sh
by nickm＠torproject.org 24 Aug '19

24 Aug '19

commit d6202d3128db259c1051eeef3e304459bcee8b53 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 12:33:42 2019 +1000 scripts/git: add TOR_PUSH_DELAY to git-push-all.sh Add a TOR_PUSH_DELAY variable to git-push-all.sh, which makes the script push master and maint branches with a delay between each branch. These delays trigger the CI jobs in a set order, which should show the most likely failures first. Also: * make pushes atomic by default, and * make the script pass any command-line arguments to git push. Closes ticket 29879. --- changes/ticket29879 | 7 +++++++ scripts/git/git-push-all.sh | 51 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/changes/ticket29879 b/changes/ticket29879 new file mode 100644 index 000000000..c37bdd3f6 --- /dev/null +++ b/changes/ticket29879 @@ -0,0 +1,7 @@ + o Minor features (git scripts): + - Add a TOR_PUSH_DELAY variable to git-push-all.sh, which makes the script + push master and maint branches with a delay between each branch. These + delays trigger the CI jobs in a set order, which should show the most + likely failures first. Also make pushes atomic by default, and make + the script pass any command-line arguments to git push. + Closes ticket 29879. diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 2030a600f..1ae310eca 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -1,11 +1,44 @@ #!/usr/bin/env bash -# The remote upstream branch on which git.torproject.org/tor.git points to. -UPSTREAM_BRANCH=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} - -git push "$UPSTREAM_BRANCH" \ - master \ - {release,maint}-0.4.1 \ - {release,maint}-0.4.0 \ - {release,maint}-0.3.5 \ - {release,maint}-0.2.9 +# Usage: git-push-all.sh +# env vars: TOR_UPSTREAM_REMOTE_NAME=upstream TOR_PUSH_DELAY=0 +# options: --no-atomic --dry-run (any other git push option) +# +# TOR_PUSH_DELAY pushes the master and maint branches separately, so that CI +# runs in a sensible order. +# push --atomic is the default when TOR_PUSH_DELAY=0, and for release branches. + +set -e + +# The upstream remote which git.torproject.org/tor.git points to. +UPSTREAM_REMOTE=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} +# Add a delay between pushes, so CI runs on the most important branches first +PUSH_DELAY=${TOR_PUSH_DELAY:-0} + +PUSH_BRANCHES=`echo \ + master \ + {release,maint}-0.4.1 \ + {release,maint}-0.4.0 \ + {release,maint}-0.3.5 \ + {release,maint}-0.2.9 \ + ` + +if [ "$PUSH_DELAY" -le 0 ]; then + echo "Pushing $PUSH_BRANCHES" + git push --atomic "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES +else + PUSH_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V` + MASTER_BRANCH=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep master` + MAINT_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint` + RELEASE_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ + tr "\n" " "` + printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\n" \ + "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES" + git push "$@" "$UPSTREAM_REMOTE" $MASTER_BRANCH + sleep "$PUSH_DELAY" + for b in $MAINT_BRANCHES; do + git push "$@" "$UPSTREAM_REMOTE" $b + sleep "$PUSH_DELAY" + done + git push --atomic "$@" "$UPSTREAM_REMOTE" $RELEASE_BRANCHES +fi

1 0

[tor/master] Fix gcc build exclude on travis
by nickm＠torproject.org 24 Aug '19

24 Aug '19

commit 190386f1c44462fbef568ca9e3c1c997dbebcf12 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 20 05:03:58 2019 +0200 Fix gcc build exclude on travis The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't, either. Reduces the number of builders by one. --- .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 428c6a000..ef2e41998 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,7 @@ matrix: - compiler: gcc os: linux ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty diff --git a/changes/bug31463 b/changes/bug31463 new file mode 100644 index 000000000..d85c0887c --- /dev/null +++ b/changes/bug31463 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463; + bugfix on 0.3.5.4-alpha.

1 0

[tor/master] Merge branch 'bug31463_035' into bug31463_040
by nickm＠torproject.org 24 Aug '19

24 Aug '19

commit 8b32d22a072a334917fba8569042ff61d7026d27 Merge: 90f4ed233 190386f1c Author: teor <teor(a)torproject.org> Date: Thu Aug 22 22:10:00 2019 +1000 Merge branch 'bug31463_035' into bug31463_040 .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'bug31463_040' into bug31463_041
by nickm＠torproject.org 24 Aug '19

24 Aug '19

commit 7c92f4faa21be4deb03a7ef2e07fb0a15853fed8 Merge: 3b2a73207 8b32d22a0 Author: teor <teor(a)torproject.org> Date: Thu Aug 22 22:10:06 2019 +1000 Merge branch 'bug31463_040' into bug31463_041 .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Merge branch 'bug31463_040' into bug31463_041
by nickm＠torproject.org 24 Aug '19

24 Aug '19

commit 7c92f4faa21be4deb03a7ef2e07fb0a15853fed8 Merge: 3b2a73207 8b32d22a0 Author: teor <teor(a)torproject.org> Date: Thu Aug 22 22:10:06 2019 +1000 Merge branch 'bug31463_040' into bug31463_041 .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.1'
by nickm＠torproject.org 24 Aug '19

24 Aug '19

commit f1707f7db3296e5ddae2f09ff269afdebf651ec4 Merge: d475d7c2f 7c92f4faa Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 24 16:29:23 2019 -0400 Merge branch 'maint-0.4.1' .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Fix gcc build exclude on travis
by nickm＠torproject.org 24 Aug '19

24 Aug '19

commit 190386f1c44462fbef568ca9e3c1c997dbebcf12 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 20 05:03:58 2019 +0200 Fix gcc build exclude on travis The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't, either. Reduces the number of builders by one. --- .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 428c6a000..ef2e41998 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,7 @@ matrix: - compiler: gcc os: linux ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty diff --git a/changes/bug31463 b/changes/bug31463 new file mode 100644 index 000000000..d85c0887c --- /dev/null +++ b/changes/bug31463 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463; + bugfix on 0.3.5.4-alpha.

1 0

[tor/release-0.4.1] Merge branch 'bug31463_035' into bug31463_040
by nickm＠torproject.org 24 Aug '19

24 Aug '19

commit 8b32d22a072a334917fba8569042ff61d7026d27 Merge: 90f4ed233 190386f1c Author: teor <teor(a)torproject.org> Date: Thu Aug 22 22:10:00 2019 +1000 Merge branch 'bug31463_035' into bug31463_040 .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 24 Aug '19

24 Aug '19

commit ef2ba568db1a404bbbd0ea35b5b61888b785120e Merge: 0e8c16e22 7c92f4faa Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 24 16:29:23 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0