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

[release/5.0] Use googletest's new 'main' branch #38411

Merged
merged 1 commit into from
Nov 15, 2021

Conversation

github-actions[bot]
Copy link
Contributor

Backport of #38410 to release/5.0

/cc @dougbu

Customer Impact

Testing

Risk

@github-actions github-actions bot requested review from dougbu, Pilchie, wtgodbe and a team as code owners November 15, 2021 20:37
@ghost ghost added this to the 5.0.x milestone Nov 15, 2021
@ghost
Copy link

ghost commented Nov 15, 2021

Hi @github-actions[bot]. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the servicing process document.
Otherwise, please add tell-mode label.

@dougbu dougbu changed the title [release/5.0] [release/6.0] Use googletest's new 'main' branch [release/5.0] Use googletest's new 'main' branch Nov 15, 2021
@dougbu
Copy link
Member

dougbu commented Nov 15, 2021

This is only indirectly a backport of #38410. #38409 is the original but I resolved submodule conflicts in #38410. Will update the final commit to reflect this.

@dougbu dougbu enabled auto-merge (squash) November 15, 2021 21:07
@wtgodbe
Copy link
Member

wtgodbe commented Nov 15, 2021

/backport to release/3.1

@dougbu
Copy link
Member

dougbu commented Nov 15, 2021

Well #38412 is already chugging along (though hitting test flakiness). Are you just testing @wtgodbe

@wtgodbe
Copy link
Member

wtgodbe commented Nov 15, 2021

Are you just testing @wtgodbe

Yes

@dougbu dougbu merged commit cfebe98 into release/5.0 Nov 15, 2021
@dougbu dougbu deleted the backport/pr-38410-to-release/5.0 branch November 15, 2021 23:13
@dougbu dougbu modified the milestones: 5.0.x, 5.0.13 Dec 15, 2021
@dougbu dougbu added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode labels Feb 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants