Skip to content

Backport os/vcbuild to fix CI failures#290

Merged
dscho merged 3 commits intomicrosoft:vfs-2.28.0from
dscho:backport/os/vcbuild
Sep 17, 2020
Merged

Backport os/vcbuild to fix CI failures#290
dscho merged 3 commits intomicrosoft:vfs-2.28.0from
dscho:backport/os/vcbuild

Conversation

@dscho
Copy link
Member

@dscho dscho commented Sep 17, 2020

We currently see a lot of CI failures in the vs-build job. These issues are known, and already resolved upstream via the os/vcbuild branch. Let's backport that branch.

Signed-off-by: Orgad Shaneh <orgads@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Schindelin <johasc@microsoft.com>
Signed-off-by: Orgad Shaneh <orgads@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Schindelin <johasc@microsoft.com>
expat.lib -> libexpat.lib (libexpatd.lib for debug build).

Signed-off-by: Orgad Shaneh <orgads@gmail.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Schindelin <johasc@microsoft.com>
Copy link

@jeffhostetler jeffhostetler left a comment

Choose a reason for hiding this comment

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

Thanks!!!

@dscho dscho merged commit e75d1f7 into microsoft:vfs-2.28.0 Sep 17, 2020
@dscho dscho deleted the backport/os/vcbuild branch September 17, 2020 12:12
@dscho dscho restored the backport/os/vcbuild branch September 17, 2020 12:19
@dscho dscho deleted the backport/os/vcbuild branch September 17, 2020 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants