Skip to content

Conversation

@jakebailey
Copy link
Member

Follow-up to #52226; these need to be force added now that lib is gitignored.

@typescript-bot typescript-bot added Author: Team For Uncommitted Bug PR for untriaged, rejected, closed or missing bug labels Mar 14, 2023
@jakebailey
Copy link
Member Author

I am wondering if it'd be easier to just remove it from the gitignore on the branch, though. Not sure if that's more error prone (via accidentally merging it back) or not.

git add tests/baselines/reference/api/typescript.d.ts
git add tests/baselines/reference/api/tsserverlibrary.d.ts
git add ./lib
git add --force ./lib
Copy link
Member Author

Choose a reason for hiding this comment

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

Actually, do we run this on main? If we run this on main to bump the version, then this isn't a good idea. @DanielRosenwasser what do you do when you bump main's version?

Copy link
Member

Choose a reason for hiding this comment

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

I do not run set-version on main, I set it manually.

git add tests/baselines/reference/api/typescript.d.ts
git add tests/baselines/reference/api/tsserverlibrary.d.ts
git add ./lib
git add --force ./lib
Copy link
Member Author

Choose a reason for hiding this comment

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

I'm a little worried that this will work the first time, then be annoying when pulling in main another time because we'll need to force it to be included. If we use the "update-lkg" workflow to do it, then it probably will be fine, but if being done manually, it might get weird.

Maybe I should just make it remove the ignore from .gitignore?

@jakebailey
Copy link
Member Author

Going to stick with --force for now. I believe that things will work if we're just using actions to manage the release branch lib folder.

@jakebailey jakebailey merged commit f306e4e into microsoft:main Apr 14, 2023
@jakebailey jakebailey deleted the update-lkg branch April 14, 2023 22:37
@microsoft microsoft locked as resolved and limited conversation to collaborators Oct 22, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Author: Team For Uncommitted Bug PR for untriaged, rejected, closed or missing bug

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants