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

BF: push to github - remove datalad-push-default-first config only in non-dry run to ensure we push default branch separately in next step #6750

Merged
merged 1 commit into from
Jun 8, 2022

Conversation

yarikoptic
Copy link
Member

@yarikoptic yarikoptic commented Jun 7, 2022

Fixes #6749. Ref: original fix in #5010 which was incomplete

  • I am not 100% confident and did not carry full archeological expedition on
    how it could have worked ever since due to that --dry-run it was "always"
    there
  • 2nd call to that push comes with refspec since it is that initial --dry-run
    which provides them. And that is when we should separate them out
  • Unfortunately since there is no dedicated dry_run option to push,
    I had to rely on matching it in git-options
  • We stopped using VCR for playing out the integration tests with github,
    and mocking out interactions would provide no point since we want to ensure
    correct operation against github. So I do not see an easy way to
    develop a unittest, so I will leave it at this

…n-dry run

Fixes datalad#6749

- I am not 100% confident and did not carry full archeological expedition on
  how it could have worked ever since due to that --dry-run it was "always"
  there
- 2nd call to that push comes with refspec since it is that initial --dry-run
  which provides them. And that is when we should separate them out
- Unfortunately since there is no dedicated dry_run option to push,
  I had to rely on matching it in git-options
- We stopped using VCR for playing out the integration tests with github,
  and mocking out interactions would provide no point since we want to ensure
  correct operation against github.  So I do not see an easy way to
  develop a unittest, so I will leave it at this
@yarikoptic yarikoptic added semver-patch Increment the patch version when merged release Create a release when this pr is merged labels Jun 7, 2022
@yarikoptic
Copy link
Member Author

appveyor -- rerunning incomplete (unrelated and known test_ria_postclonecfg attn @bpoldrack)

@yarikoptic
Copy link
Member Author

travis -- known #4101 (Restarted). appveyor -- test_ria_postclonecfg (attn @bpoldrack )

if no objections and no further comments, since fix is IMHO straightforward, I will merge (and thus release) tomorrow

@yarikoptic yarikoptic merged commit 044411c into datalad:maint Jun 8, 2022
@github-actions
Copy link

github-actions bot commented Jun 8, 2022

🚀 PR was released in 0.16.5 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release Create a release when this pr is merged released semver-patch Increment the patch version when merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant