You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by GitBox <gi...@apache.org> on 2022/03/22 17:51:21 UTC
[GitHub] [arrow] lafiona opened a new pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
lafiona opened a new pull request #12693:
URL: https://github.com/apache/arrow/pull/12693
## Overview
The goal of this pull request is to add functionality to `dev/merge_arrow_pr.py`, that checks individual commit messages for "Co-authored-by:" tags, when creating the squashed commit message when merging a pull request.
This will ensure that all authors are included in the final commit message, to make sure they are acknowledged for their contributions.
## Implementation
1. Use the [`trailers`](https://git-scm.com/docs/git-log#Documentation/git-log.txt-emtrailersoptionsem) options of `git log` to check for the [`Co-authored-by` trailer](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors). The equivalent `git` command is:
`git log HEAD..<pull-request-branch> --pretty="%(trailers:key=Co-authored-by,valueonly)"`
2. For each commit in `<pull-request-branch>`, this command prints the value of any `Co-authored-by` trailers, which should be in the form of `<name> <<email-address>>`.
3. The values returned by this command are appended to the list of all commit authors.
## Testing
I attempted to qualify the changes to `merge_arrow_pr.py` by taking the the following steps:
1. Created a branch for this change, [ARROW-13564](https://github.com/mathworks/arrow/tree/ARROW-13564) and corresponding [pull request](https://github.com/apache/arrow/pull/12682).
3. Set the DEBUGGING environment variable to `1`.
4. Following the steps within `merge_arrow_pr.py`, I run the merge script from an `apache/arrow` cloned repository and receive an error that (I believe) is indicating I do not have necessary repository permissions to continue with the merge request:
```
Proceed with merging pull request #12682? (y/n): y
fatal: 'apache' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
Command failed: ['git', 'fetch', 'apache', 'pull/12682/head:PR_TOOL_MERGE_PR_12682']
```
I am not able to reach the step where the new commit message is created. Do you have any advice for qualifying this change?
## Notes
Thank you @kevingurney for your help with this pull request!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] ursabot edited a comment on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
ursabot edited a comment on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1081163083
Benchmark runs are scheduled for baseline = d327f694d7cd6b5919fe1df7d9dea6e7ebef03e1 and contender = 919d113883276e3a4f56399009d8f2527fce60d0. 919d113883276e3a4f56399009d8f2527fce60d0 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished :arrow_down:0.0% :arrow_up:0.0%] [ec2-t3-xlarge-us-east-2](https://conbench.ursa.dev/compare/runs/8a11f402a77144fa9a427b12fdd45cfe...c111763b9ad248c1963960d709b3f11c/)
[Scheduled] [test-mac-arm](https://conbench.ursa.dev/compare/runs/2e94844ad87041f6a193de8d69e2f601...43a8b1b44ba34f289d2dd5b1e01ac7d5/)
[Scheduled] [ursa-i9-9960x](https://conbench.ursa.dev/compare/runs/6e8b0ef2489346cf8fb2f077d427336f...566122ae01644b52b2ba4c7e119eb6ba/)
[Scheduled] [ursa-thinkcentre-m75q](https://conbench.ursa.dev/compare/runs/f8cccdc1df7741a29879cb4f7781cfdd...2934d0c5d0504baeb83ff3c67da206e6/)
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] github-actions[bot] commented on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1075444401
https://issues.apache.org/jira/browse/ARROW-13564
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] ursabot edited a comment on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
ursabot edited a comment on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1081163083
Benchmark runs are scheduled for baseline = d327f694d7cd6b5919fe1df7d9dea6e7ebef03e1 and contender = 919d113883276e3a4f56399009d8f2527fce60d0. 919d113883276e3a4f56399009d8f2527fce60d0 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished :arrow_down:0.0% :arrow_up:0.0%] [ec2-t3-xlarge-us-east-2](https://conbench.ursa.dev/compare/runs/8a11f402a77144fa9a427b12fdd45cfe...c111763b9ad248c1963960d709b3f11c/)
[Finished :arrow_down:0.29% :arrow_up:0.0%] [test-mac-arm](https://conbench.ursa.dev/compare/runs/2e94844ad87041f6a193de8d69e2f601...43a8b1b44ba34f289d2dd5b1e01ac7d5/)
[Scheduled] [ursa-i9-9960x](https://conbench.ursa.dev/compare/runs/6e8b0ef2489346cf8fb2f077d427336f...566122ae01644b52b2ba4c7e119eb6ba/)
[Finished :arrow_down:0.34% :arrow_up:1.15%] [ursa-thinkcentre-m75q](https://conbench.ursa.dev/compare/runs/f8cccdc1df7741a29879cb4f7781cfdd...2934d0c5d0504baeb83ff3c67da206e6/)
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] lafiona commented on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
lafiona commented on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1080947378
I think you're right that `merge` cannot be tested unless there is a git repo, that the test script can create commits and pull requests on, or git mocking infrastructure. I can create a separate Jira ticket for capturing this work.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] lafiona edited a comment on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
lafiona edited a comment on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1076473493
Thank you for your help with this, @lidavidm ! I was able to verify that the change adds Co-authors to the squashed commit that will be used for the pull request. I've updated the usage text to include the two environment variables that were helpful for my workflow. And I've also updated the description for this pull request.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] lafiona commented on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
lafiona commented on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1076473493
Thank you for your help with this, @lidavidm ! I was able to verify that the change adds Co-authors to the squashed commit that will be used for the pull request. I've updated the usage text to include the two environment variables that were helpful for my workflow. And I've also updated the description for this pull request.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] lidavidm commented on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
lidavidm commented on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1080949010
Thanks. (Sorry, didn't mean to send you down a wild rabbit chase.)
GitHub Actions seem a little backed up today, but LGTM.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] lidavidm closed pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
lidavidm closed pull request #12693:
URL: https://github.com/apache/arrow/pull/12693
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] lidavidm commented on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
lidavidm commented on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1076293620
It seems you just need to `git remote add apache git@github.com:apache/arrow.git` (the merge script assumes a remote named `apache`)
Alternatively, set `PR_REMOTE_NAME`, e.g. `env PR_REMOTE_NAME=origin ./dev/merge_arrow_pr.py 12682`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] ursabot edited a comment on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
ursabot edited a comment on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1081163083
Benchmark runs are scheduled for baseline = d327f694d7cd6b5919fe1df7d9dea6e7ebef03e1 and contender = 919d113883276e3a4f56399009d8f2527fce60d0. 919d113883276e3a4f56399009d8f2527fce60d0 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished :arrow_down:0.0% :arrow_up:0.0%] [ec2-t3-xlarge-us-east-2](https://conbench.ursa.dev/compare/runs/8a11f402a77144fa9a427b12fdd45cfe...c111763b9ad248c1963960d709b3f11c/)
[Finished :arrow_down:0.29% :arrow_up:0.0%] [test-mac-arm](https://conbench.ursa.dev/compare/runs/2e94844ad87041f6a193de8d69e2f601...43a8b1b44ba34f289d2dd5b1e01ac7d5/)
[Finished :arrow_down:0.0% :arrow_up:0.0%] [ursa-i9-9960x](https://conbench.ursa.dev/compare/runs/6e8b0ef2489346cf8fb2f077d427336f...566122ae01644b52b2ba4c7e119eb6ba/)
[Finished :arrow_down:0.34% :arrow_up:1.15%] [ursa-thinkcentre-m75q](https://conbench.ursa.dev/compare/runs/f8cccdc1df7741a29879cb4f7781cfdd...2934d0c5d0504baeb83ff3c67da206e6/)
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] lidavidm commented on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
lidavidm commented on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1076728116
Thanks!
It looks the Github incident today means CI didn't fully trigger on this PR - do you mind rebasing to make sure it all runs?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] lidavidm commented on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
lidavidm commented on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1080744076
@lafiona did you mean to push the matlab commit to this PR?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] lafiona commented on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
lafiona commented on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1080790006
@lidavidm , I apologize for the MATLAB commit! I did not mean to push it to this branch.
I've rebased the correct commits onto `apache/arrow` `master` to trigger the CI. I am still investigating adding tests to `test_merge_arrow_pr.py` and will update here when I have a solution.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] lidavidm commented on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
lidavidm commented on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1080856447
To be fair there might not be too good a way to test it, at least without mocking, or setting up a fake git repo to manipulate (and it certainly doesn't seem to test it right now)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] ursabot commented on pull request #12693: ARROW-13564: [Dev] Check individual commit messages for "Co-authored-by:" tags when integrating a pull request
Posted by GitBox <gi...@apache.org>.
ursabot commented on pull request #12693:
URL: https://github.com/apache/arrow/pull/12693#issuecomment-1081163083
Benchmark runs are scheduled for baseline = d327f694d7cd6b5919fe1df7d9dea6e7ebef03e1 and contender = 919d113883276e3a4f56399009d8f2527fce60d0. 919d113883276e3a4f56399009d8f2527fce60d0 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Scheduled] [ec2-t3-xlarge-us-east-2](https://conbench.ursa.dev/compare/runs/8a11f402a77144fa9a427b12fdd45cfe...c111763b9ad248c1963960d709b3f11c/)
[Scheduled] [test-mac-arm](https://conbench.ursa.dev/compare/runs/2e94844ad87041f6a193de8d69e2f601...43a8b1b44ba34f289d2dd5b1e01ac7d5/)
[Scheduled] [ursa-i9-9960x](https://conbench.ursa.dev/compare/runs/6e8b0ef2489346cf8fb2f077d427336f...566122ae01644b52b2ba4c7e119eb6ba/)
[Scheduled] [ursa-thinkcentre-m75q](https://conbench.ursa.dev/compare/runs/f8cccdc1df7741a29879cb4f7781cfdd...2934d0c5d0504baeb83ff3c67da206e6/)
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org