Skip to content

TypeScript Bot's sync release-X.X fails #38174

New issue

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

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

Already on GitHub? # to your account

Closed
DanielRosenwasser opened this issue Apr 24, 2020 · 5 comments
Closed

TypeScript Bot's sync release-X.X fails #38174

DanielRosenwasser opened this issue Apr 24, 2020 · 5 comments
Assignees
Labels
Infrastructure Issue relates to TypeScript team infrastructure

Comments

@DanielRosenwasser
Copy link
Member

This is the first time we tried running it, so not super unexpected, but looks like we probably wanted to merge from origin/master instead of master.

#37198 (comment)

https://github.com/microsoft/TypeScript/runs/616943054?check_suite_focus=true

image

@DanielRosenwasser DanielRosenwasser added the Infrastructure Issue relates to TypeScript team infrastructure label Apr 24, 2020
@DanielRosenwasser
Copy link
Member Author

This might've just been due to a merge conflict, in which case maybe we just want to always take in master?

@weswigham
Copy link
Member

as in deleting the releases branch and force pushing master as the new release?

@DanielRosenwasser
Copy link
Member Author

Ehh, maybe let's discuss later this week

@DanielRosenwasser
Copy link
Member Author

It happened again for different reasons

#40124 (comment)

Run git config user.email "typescriptbot@microsoft.com"
From https://github.com/microsoft/TypeScript
 * branch              master     -> FETCH_HEAD
 * [new branch]        master     -> origin/master
fatal: refusing to merge unrelated histories
##[error]Process completed with exit code 128.

@DanielRosenwasser DanielRosenwasser added this to the TypeScript 4.1.1 milestone Sep 15, 2020
@weswigham
Copy link
Member

Fixed - the task was broken when it was changed to checkout@v2, since that, by default, does not include history.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Infrastructure Issue relates to TypeScript team infrastructure
Projects
None yet
Development

No branches or pull requests

2 participants