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.

Sign up for GitHub

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

Jump to bottom

Force add lib in workflows which commit LKG #53248

Merged
merged 4 commits into from
Apr 14, 2023
Merged

Force add lib in workflows which commit LKG #53248

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
021ef31
Force add lib in workflows which commit LKG
jakebailey Mar 14, 2023
ffc7ea0
Update .github/workflows/update-lkg.yml
jakebailey Mar 14, 2023
78000bb
revert package-lock change
jakebailey Apr 14, 2023
091c068
Add --force to new-release-branch, though it doesn't work
jakebailey Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/set-version.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ jobs:
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/typescript.d.ts
sed -i -e 's/const versionMajorMinor = ".*"/const versionMajorMinor = "${{ github.event.client_payload.core_major_minor }}"/g' tests/baselines/reference/api/tsserverlibrary.d.ts
sed -i -e 's/const version\(: string\)\{0,1\} = .*;/const version = "${{ github.event.client_payload.package_version }}" as string;/g' src/compiler/corePublic.ts
npm ci
npm install
jakebailey marked this conversation as resolved.
Show resolved Hide resolved
npx hereby LKG
npm test
git diff
git add package.json
git add package.json package-lock.json
git add src/compiler/corePublic.ts
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.

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?

git config user.email "typescriptbot@microsoft.com"
git config user.name "TypeScript Bot"
git commit -m 'Bump version to ${{ github.event.client_payload.package_version }} and LKG'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-lkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
npx hereby LKG
npm test
git diff
git add ./lib
git add --force ./lib
git commit -m "Update LKG"
git push