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

[tor/master] 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/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 677048fe9fd04363f1709aa9df7596d70fe542d6 Merge: 9323f5d1d d0007db1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 20:44:16 2018 -0400 Merge branch 'maint-0.3.4'

1 0

[tor/release-0.3.4] Appveyor CI: Fix GitHub provider detection
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 73d46b76fd885a108674687cc211efd848641bfe Author: teor <teor(a)torproject.org> Date: Tue Jul 31 11:09:54 2018 +1000 Appveyor CI: Fix GitHub provider detection Part of 26979. --- scripts/test/appveyor-irc-notify.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index 4ffea5268..297b02b15 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -22,6 +22,9 @@ # - Accept UTF-8 # - only guess github URLs # - stop using ANSI colors +# +# Modified by teor in 2018: +# - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently) # This program is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software Foundation; @@ -110,7 +113,7 @@ def appveyor_vars(): BUILD_FMT = u'{url}/project/{account_name}/{project_name}/build/{build_version}' - if vars["repo_provider"] == 'github': + if vars["repo_provider"].lower().startswith('github'): COMMIT_FMT = u'https://{repo_provider}.com/{repo_name}/commit/{repo_commit}' vars.update(commit_url=COMMIT_FMT.format(**vars))

1 0

[tor/release-0.3.4] Appveyor CI: fix some typos
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 32fb4403e3b7bbc48a57f565c67cedd79e408794 Author: teor <teor(a)torproject.org> Date: Tue Jul 31 11:49:11 2018 +1000 Appveyor CI: fix some typos --- scripts/test/appveyor-irc-notify.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index b06534c3f..59514bebe 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -55,7 +55,7 @@ export APPVEYOR_URL=https://ci.appveyor.com export APPVEYOR_PROJECT_NAME=tor export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23 -export APPVEYOR_REPO_PROVIDER=gihub +export APPVEYOR_REPO_PROVIDER=github export APPVEYOR_REPO_BRANCH=repo_branch export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title export APPVEYOR_BUILD_VERSION=1 @@ -88,7 +88,7 @@ import time def appveyor_vars(): """ - Return a dict of key value carfted from appveyor environment variables. + Return a dict of key value crafted from appveyor environment variables. """ vars = dict([

1 0

[tor/release-0.3.4] Appveyor CI: Switch to one URL per line
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 41570157004bd7d546f29e1298ffd5102272929c Author: teor <teor(a)torproject.org> Date: Tue Jul 31 11:37:11 2018 +1000 Appveyor CI: Switch to one URL per line Part of 26979. --- scripts/test/appveyor-irc-notify.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index f830db4e4..eb4d26ba3 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -27,6 +27,7 @@ # - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently) # - make short commits 10 hexdigits long (that's what git does for tor) # - generate correct branches and URLs for pull requests +# - switch to one URL per line # This program is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software Foundation; @@ -155,17 +156,16 @@ def notify(): messages.append(u"{branch_detail} - {repo_commit_author}: {repo_commit_message}") if success: - m = u"Build #{build_version} passed. Details: {build_url}" + messages.append(u"Build #{build_version} passed. Details: {build_url}") if failure: - m = u"Build #{build_version} failed. Details: {build_url}" + messages.append(u"Build #{build_version} failed. Details: {build_url}") if "commit_url" in apvy_vars: - m += " Commit: {commit_url}" + messages.append(u"Commit: {commit_url}") if "pull_url" in apvy_vars: - m += " Pull: {pull_url}" + messages.append(u"Pull: {pull_url}") - messages.append(m) else: messages = sys.argv[3:] messages = ' '.join(messages)

1 0

[tor/release-0.3.4] Appveyor CI: Make short commits 10 hexdigits long
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit d8ce84aae4b3b070025bddeb5231147c19ace94d Author: teor <teor(a)torproject.org> Date: Tue Jul 31 11:10:55 2018 +1000 Appveyor CI: Make short commits 10 hexdigits long That's what git does for tor. Part of 26979. --- scripts/test/appveyor-irc-notify.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index 297b02b15..fc2ead164 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -25,6 +25,7 @@ # # Modified by teor in 2018: # - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently) +# - make short commits 10 hexdigits long (that's what git does for tor) # This program is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software Foundation; @@ -119,7 +120,7 @@ def appveyor_vars(): vars.update( build_url=BUILD_FMT.format(**vars), - short_commit=vars["repo_commit"][:7], + short_commit=vars["repo_commit"][:10], ) return vars

1 0

[tor/release-0.3.4] Appveyor CI: Generate correct tag names
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 965a910abf62523e72c50f216fba15b1395fc03d Author: teor <teor(a)torproject.org> Date: Tue Jul 31 11:47:33 2018 +1000 Appveyor CI: Generate correct tag names Part of 26979. --- scripts/test/appveyor-irc-notify.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index eb4d26ba3..b06534c3f 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -26,7 +26,7 @@ # Modified by teor in 2018: # - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently) # - make short commits 10 hexdigits long (that's what git does for tor) -# - generate correct branches and URLs for pull requests +# - generate correct branches and URLs for pull requests and tags # - switch to one URL per line # This program is free software; you can redistribute it and/or modify it under the @@ -113,7 +113,8 @@ def appveyor_vars(): 'APPVEYOR_REPO_COMMIT_MESSAGE', 'APPVEYOR_ACCOUNT_NAME', 'APPVEYOR_PULL_REQUEST_NUMBER', - 'APPVEYOR_REPO_NAME' + 'APPVEYOR_REPO_NAME', + 'APPVEYOR_REPO_TAG_NAME', ] ]) @@ -122,7 +123,11 @@ def appveyor_vars(): ) BUILD_FMT = u'{url}/project/{account_name}/{project_name}/build/{build_version}' - BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}' + + if vars["repo_tag_name"]: + BRANCH_FMT = u'{repo_name} {repo_tag_name} {short_commit}' + else: + BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}' if vars["repo_provider"].lower().startswith('github'): COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}'

1 0

[tor/release-0.3.4] Appveyor CI: Generate correct branches and URLs for pull requests
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 6a870c69bb0f191ac95d36ef7ef4038df04da2dd Author: teor <teor(a)torproject.org> Date: Tue Jul 31 11:12:21 2018 +1000 Appveyor CI: Generate correct branches and URLs for pull requests Part of 26979. --- scripts/test/appveyor-irc-notify.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index fc2ead164..f830db4e4 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -26,6 +26,7 @@ # Modified by teor in 2018: # - fix github provider detection ('gitHub' or 'gitHubEnterprise', apparently) # - make short commits 10 hexdigits long (that's what git does for tor) +# - generate correct branches and URLs for pull requests # This program is free software; you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software Foundation; @@ -102,6 +103,9 @@ def appveyor_vars(): 'APPVEYOR_REPO_COMMIT_TIMESTAMP', 'APPVEYOR_REPO_PROVIDER', 'APPVEYOR_PROJECT_NAME', + 'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME', + 'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH', + 'APPVEYOR_PULL_REQUEST_HEAD_COMMIT', 'APPVEYOR_PULL_REQUEST_TITLE', 'APPVEYOR_BUILD_VERSION', 'APPVEYOR_REPO_COMMIT', @@ -112,15 +116,25 @@ def appveyor_vars(): ] ]) + vars.update( + short_commit=vars["repo_commit"][:10], + ) + BUILD_FMT = u'{url}/project/{account_name}/{project_name}/build/{build_version}' + BRANCH_FMT = u'{repo_name} {repo_branch} {short_commit}' if vars["repo_provider"].lower().startswith('github'): - COMMIT_FMT = u'https://{repo_provider}.com/{repo_name}/commit/{repo_commit}' + COMMIT_FMT = u'https://github.com/{repo_name}/commit/{repo_commit}' + if vars["pull_request_number"]: + 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( build_url=BUILD_FMT.format(**vars), - short_commit=vars["repo_commit"][:10], + branch_detail=BRANCH_FMT.format(**vars), ) return vars @@ -138,7 +152,7 @@ def notify(): if success or failure: messages = [] - messages.append(u"{repo_name} {repo_branch} {short_commit} - {repo_commit_author}: {repo_commit_message}") + messages.append(u"{branch_detail} - {repo_commit_author}: {repo_commit_message}") if success: m = u"Build #{build_version} passed. Details: {build_url}" @@ -147,7 +161,10 @@ def notify(): if "commit_url" in apvy_vars: m += " Commit: {commit_url}" - + + if "pull_url" in apvy_vars: + m += " Pull: {pull_url}" + messages.append(m) else: messages = sys.argv[3:]

1 0

[tor/release-0.3.4] Appveyor CI: Changes file for 26979
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 842509171830406d03f35383c71b57f1264dedb0 Author: teor <teor(a)torproject.org> Date: Tue Jul 31 11:58:04 2018 +1000 Appveyor CI: Changes file for 26979 Closes 26979. --- changes/bug26979 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug26979 b/changes/bug26979 new file mode 100644 index 000000000..e615207b7 --- /dev/null +++ b/changes/bug26979 @@ -0,0 +1,4 @@ + o Minor bugfixes (appveyor ci): + - Improve Appveyor CI IRC logging. Generate correct branches and URLs for + pull requests and tags. Use unambiguous short commits. + Fixes bug 26979; bugfix on master.

1 0

[tor/release-0.3.4] Appveyor CI: sort environmental variables
by nickm＠torproject.org 24 Aug '18

24 Aug '18

commit 3ecb7125b4bc0f92d5b7e3be13c787d9ea189639 Author: teor <teor(a)torproject.org> Date: Tue Jul 31 11:54:02 2018 +1000 Appveyor CI: sort environmental variables To avoid future duplicates. --- scripts/test/appveyor-irc-notify.py | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/test/appveyor-irc-notify.py b/scripts/test/appveyor-irc-notify.py index 59514bebe..639acc6ce 100644 --- a/scripts/test/appveyor-irc-notify.py +++ b/scripts/test/appveyor-irc-notify.py @@ -51,19 +51,19 @@ delineate multiple messages. Example: -export APPVEYOR_URL=https://ci.appveyor.com +export APPVEYOR_ACCOUNT_NAME=isislovecruft +export APPVEYOR_BUILD_VERSION=1 export APPVEYOR_PROJECT_NAME=tor -export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft -export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23 -export APPVEYOR_REPO_PROVIDER=github -export APPVEYOR_REPO_BRANCH=repo_branch +export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number export APPVEYOR_PULL_REQUEST_TITLE=pull_request_title -export APPVEYOR_BUILD_VERSION=1 +export APPVEYOR_REPO_BRANCH=repo_branch export APPVEYOR_REPO_COMMIT=22c95b72e29248dc4de9b85e590ee18f6f587de8 +export APPVEYOR_REPO_COMMIT_AUTHOR=isislovecruft export APPVEYOR_REPO_COMMIT_MESSAGE="some IRC test" -export APPVEYOR_ACCOUNT_NAME=isislovecruft -export APPVEYOR_PULL_REQUEST_NUMBER=pull_request_number +export APPVEYOR_REPO_COMMIT_TIMESTAMP=2018-04-23 export APPVEYOR_REPO_NAME=isislovecruft/tor +export APPVEYOR_REPO_PROVIDER=github +export APPVEYOR_URL=https://ci.appveyor.com python ./appveyor-irc-notify.py irc.oftc.net:6697 tor-ci '{repo_name} {repo_branch} {short_commit} - {repo_commit_author}: {repo_commit_message}','Build #{build_version} passed. Details: {build_url} | Commit: {commit_url} See also https://github.com/gridsync/gridsync/blob/master/appveyor.yml for examples @@ -96,25 +96,25 @@ def appveyor_vars(): v.replace('APPVEYOR_', '').lower(), os.getenv(v, '').decode('utf-8') ) for v in [ - 'APPVEYOR_URL', - 'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED', - 'APPVEYOR_REPO_BRANCH', - 'APPVEYOR_REPO_COMMIT_AUTHOR', - 'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL', - 'APPVEYOR_REPO_COMMIT_TIMESTAMP', - 'APPVEYOR_REPO_PROVIDER', + 'APPVEYOR_ACCOUNT_NAME', + 'APPVEYOR_BUILD_VERSION', 'APPVEYOR_PROJECT_NAME', - 'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME', - 'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH', 'APPVEYOR_PULL_REQUEST_HEAD_COMMIT', + 'APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH', + 'APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME', + 'APPVEYOR_PULL_REQUEST_NUMBER', 'APPVEYOR_PULL_REQUEST_TITLE', - 'APPVEYOR_BUILD_VERSION', + 'APPVEYOR_REPO_BRANCH', 'APPVEYOR_REPO_COMMIT', + 'APPVEYOR_REPO_COMMIT_AUTHOR', + 'APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL', 'APPVEYOR_REPO_COMMIT_MESSAGE', - 'APPVEYOR_ACCOUNT_NAME', - 'APPVEYOR_PULL_REQUEST_NUMBER', + 'APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED', + 'APPVEYOR_REPO_COMMIT_TIMESTAMP', 'APPVEYOR_REPO_NAME', + 'APPVEYOR_REPO_PROVIDER', 'APPVEYOR_REPO_TAG_NAME', + 'APPVEYOR_URL', ] ])

1 0