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

[tor/release-0.3.4] Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit d0007db1f03fab143e0bb376df187a0560682197 Merge: 90f6c590a 78049afaa Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 20:44:06 2018 -0400 Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4 changes/bug26979 | 4 ++ scripts/test/appveyor-irc-notify.py | 83 ++++++++++++++++++++++++------------- 2 files changed, 59 insertions(+), 28 deletions(-)

1 0

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

24 Aug '18

commit 5c3998a02773af87a27265bf9e4d936cc07cc9d1 Merge: 1b5c9a580 d0007db1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 20:44:16 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26979 | 4 ++ scripts/test/appveyor-irc-notify.py | 83 ++++++++++++++++++++++++------------- 2 files changed, 59 insertions(+), 28 deletions(-)

1 0

[tor/release-0.3.4] Appveyor CI: always use HEAD for the short commit
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 78049afaa569a95cf1c7cd55c3b24a784ee15e07 Author: teor <teor(a)torproject.org> Date: Tue Jul 31 12:14:40 2018 +1000 Appveyor CI: always use HEAD for the short commit Part of 26979. --- scripts/test/appveyor-irc-notify.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index 639acc6ce..cfe0afe7a 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -118,10 +118,6 @@ def appveyor_vars(): ] ]) - vars.update( - short_commit=vars["repo_commit"][:10], - ) - BUILD_FMT = u'{url}/project/{account_name}/{project_name}/build/{build_version}' if vars["repo_tag_name"]: @@ -129,15 +125,20 @@ def appveyor_vars(): else: BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}' + vars.update(head_commit=vars["repo_commit"]) + if vars["repo_provider"].lower().startswith('github'): COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}' if vars["pull_request_number"]: + vars.update(head_commit=vars["pull_request_head_commit"]) BRANCH_FMT = u'{repo_name} {repo_branch} pull {pull_request_head_repo_name} {pull_request_head_repo_branch} {short_commit}' COMMIT_FMT = u'https://github.com/{pull_request_head_repo_name}/commit/{pull_request_head_…' PULL_FMT = u'https://github.com/{repo_name}/pull/{pull_request_number}' vars.update(pull_url=PULL_FMT.format(**vars)) vars.update(commit_url=COMMIT_FMT.format(**vars)) + vars.update(short_commit=vars["head_commit"][:10]) + vars.update( build_url=BUILD_FMT.format(**vars), branch_detail=BRANCH_FMT.format(**vars),

1 0

[tor/maint-0.3.4] CI: Only post Appveyor IRC notifications when the build fails
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 08ad1f1e463cea014a66670b629c40fa1bbcf669 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 09:39:36 2018 +1000 CI: Only post Appveyor IRC notifications when the build fails Implements 27275. --- .appveyor.yml | 3 --- changes/ticket27275 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 197097d1f..d1d8d7c45 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -54,9 +54,6 @@ test_script: Execute-Bash "VERBOSE=1 make -j2 check" } -on_success: -- cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci success - on_failure: - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure diff --git a/changes/ticket27275 b/changes/ticket27275 new file mode 100644 index 000000000..d1332e954 --- /dev/null +++ b/changes/ticket27275 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Only post Appveyor IRC notifications when the build fails. + Implements ticket 27275.

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 90f6c590afbf90ffeeee8bf2b45921638b23ae32 Merge: 6e0872e86 08ad1f1e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 20:07:39 2018 -0400 Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4 .appveyor.yml | 3 --- changes/ticket27275 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

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

24 Aug '18

commit 9323f5d1d45f46e55f565fff59a4595954328219 Merge: d50f90bfc 90f6c590a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 20:07:47 2018 -0400 Merge branch 'maint-0.3.4' .appveyor.yml | 3 --- changes/ticket27275 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 90f6c590afbf90ffeeee8bf2b45921638b23ae32 Merge: 6e0872e86 08ad1f1e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 20:07:39 2018 -0400 Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4 .appveyor.yml | 3 --- changes/ticket27275 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] CI: Only post Appveyor IRC notifications when the build fails
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 08ad1f1e463cea014a66670b629c40fa1bbcf669 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 09:39:36 2018 +1000 CI: Only post Appveyor IRC notifications when the build fails Implements 27275. --- .appveyor.yml | 3 --- changes/ticket27275 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 197097d1f..d1d8d7c45 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -54,9 +54,6 @@ test_script: Execute-Bash "VERBOSE=1 make -j2 check" } -on_success: -- cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci success - on_failure: - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure diff --git a/changes/ticket27275 b/changes/ticket27275 new file mode 100644 index 000000000..d1332e954 --- /dev/null +++ b/changes/ticket27275 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Only post Appveyor IRC notifications when the build fails. + Implements ticket 27275.

1 0

[tor/release-0.3.4] CI: Only post Appveyor IRC notifications when the build fails
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 08ad1f1e463cea014a66670b629c40fa1bbcf669 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 09:39:36 2018 +1000 CI: Only post Appveyor IRC notifications when the build fails Implements 27275. --- .appveyor.yml | 3 --- changes/ticket27275 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 197097d1f..d1d8d7c45 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -54,9 +54,6 @@ test_script: Execute-Bash "VERBOSE=1 make -j2 check" } -on_success: -- cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci success - on_failure: - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure diff --git a/changes/ticket27275 b/changes/ticket27275 new file mode 100644 index 000000000..d1332e954 --- /dev/null +++ b/changes/ticket27275 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Only post Appveyor IRC notifications when the build fails. + Implements ticket 27275.

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 90f6c590afbf90ffeeee8bf2b45921638b23ae32 Merge: 6e0872e86 08ad1f1e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 20:07:39 2018 -0400 Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4 .appveyor.yml | 3 --- changes/ticket27275 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

1 0