Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename {commit} to {build_commit}; {commit} now refers to triggering commit #64

Merged
merged 1 commit into from
May 28, 2021

Conversation

jwodder
Copy link
Member

@jwodder jwodder commented May 28, 2021

Closes #55.

@jwodder jwodder added the minor Increment the minor version when merged label May 28, 2021
as ``{build_commit}``. For pull request builds on
Appveyor, this is the head of the PR branch. For pull
request builds on Travis, this is ``UNK``, as the API does
not expose the original commit.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but I still hope we workaround as discussed in #55 (comment), right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you mean pulling PR branches from GitHub, I consider that overkill.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but we do not have a better solution, do we?
The only other workaround I see is particular to DataLad setup since would require Appveyor run (now that we know that merge is done by github so the same across CIs) is to take information from Appveyor run which knows the commit for the build_commit and use for all CIs. Might also be needed/desired to establish persistent cache of knowing such mappings from build_commit to commit.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The best alternative I can think of is querying the GitHub API for information on the PR, checking whether the merge commit is the same as the build commit, and, if so, using the head commit listed there. It'll require some rewriting of the code that I'd prefer to do in a separate PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, thank you, let's proceed then

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
minor Increment the minor version when merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

push vs PR commit
2 participants