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

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 4013e50cb732bfb3e2706baef5cd7aba8d16d8c4 Merge: 9bb0ca122 21c3488af Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 .appveyor.yml | 12 ++++++++++++ changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml | 12 ++++++++++++ changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml | 12 ++++++++++++ changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

1 0

[tor/release-0.4.1] Appveyor: Avoid spurious errors in Appveyor CI builds
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit b186418792fe1283855acf2f143661b7c6d7254e Author: teor <teor(a)torproject.org> Date: Mon Sep 30 15:14:21 2019 +1000 Appveyor: Avoid spurious errors in Appveyor CI builds When Appveyor fails before the install step, some of the finish step's functions were not defined. Fixes bug 31884; bugfix on 0.3.4.2-alpha. --- .appveyor.yml | 12 ++++++++++++ changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 9913bf3bd..54456aa25 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -100,6 +100,18 @@ test_script: on_finish: - ps: >- + <# if we failed before install:, these functions won't be defined #> + Function Execute-Command ($commandPath) + { + & $commandPath $args 2>&1 + if ( $LastExitCode -ne 0 ) { + $host.SetShouldExit( $LastExitCode ) + } + } + Function Execute-Bash () + { + Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args + } if ($env:compiler -eq "mingw") { <# use the MSYS2 user binaries to archive failures #> $oldpath = ${env:Path} -split ';' diff --git a/changes/bug31884 b/changes/bug31884 new file mode 100644 index 000000000..ddb6c50d7 --- /dev/null +++ b/changes/bug31884 @@ -0,0 +1,3 @@ + o Minor bugfixes (Appveyor CI): + - Avoid spurious errors when Appveyor CI fails before the install step. + Fixes bug 31884; bugfix on 0.3.4.2-alpha.

1 0

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

22 Oct '19

commit 8bef3a76a917c879b0d675961953af0bbf5378cd Merge: da1d900d3 6965798a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 .appveyor.yml | 12 ++++++++++++ changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 6965798a160e7caa07899216f35deeee9d6641ed Merge: 4c8af10f0 4013e50cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml | 12 ++++++++++++ changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit e5b9eefb02ddd951d3b959ebb5d2ca72ea65a9a9 Merge: cbc67241d 6965798a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

[tor/release-0.3.5] Appveyor: Avoid spurious errors in Appveyor CI builds
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit b186418792fe1283855acf2f143661b7c6d7254e Author: teor <teor(a)torproject.org> Date: Mon Sep 30 15:14:21 2019 +1000 Appveyor: Avoid spurious errors in Appveyor CI builds When Appveyor fails before the install step, some of the finish step's functions were not defined. Fixes bug 31884; bugfix on 0.3.4.2-alpha. --- .appveyor.yml | 12 ++++++++++++ changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 9913bf3bd..54456aa25 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -100,6 +100,18 @@ test_script: on_finish: - ps: >- + <# if we failed before install:, these functions won't be defined #> + Function Execute-Command ($commandPath) + { + & $commandPath $args 2>&1 + if ( $LastExitCode -ne 0 ) { + $host.SetShouldExit( $LastExitCode ) + } + } + Function Execute-Bash () + { + Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args + } if ($env:compiler -eq "mingw") { <# use the MSYS2 user binaries to archive failures #> $oldpath = ${env:Path} -split ';' diff --git a/changes/bug31884 b/changes/bug31884 new file mode 100644 index 000000000..ddb6c50d7 --- /dev/null +++ b/changes/bug31884 @@ -0,0 +1,3 @@ + o Minor bugfixes (Appveyor CI): + - Avoid spurious errors when Appveyor CI fails before the install step. + Fixes bug 31884; bugfix on 0.3.4.2-alpha.

1 0

[tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 6965798a160e7caa07899216f35deeee9d6641ed Merge: 4c8af10f0 4013e50cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .appveyor.yml | 12 ++++++++++++ changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 21c3488af714ade6f07251194165d92f77f06c31 Merge: bed439013 b18641879 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 12:10:08 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 .appveyor.yml | 12 ++++++++++++ changes/bug31884 | 3 +++ 2 files changed, 15 insertions(+)

1 0