From 021ef310f472102a5d21a776874829d0c2fa4313 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Tue, 14 Mar 2023 09:42:41 -0700
Subject: [PATCH 1/4] Force add lib in workflows which commit LKG

---
 .github/workflows/set-version.yaml | 6 +++---
 .github/workflows/update-lkg.yml   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/set-version.yaml b/.github/workflows/set-version.yaml
index ce7da6726eb76..227934c8c21b8 100644
--- a/.github/workflows/set-version.yaml
+++ b/.github/workflows/set-version.yaml
@@ -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
         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
         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'
diff --git a/.github/workflows/update-lkg.yml b/.github/workflows/update-lkg.yml
index b2fd19c02d938..c52789ea1ccb1 100644
--- a/.github/workflows/update-lkg.yml
+++ b/.github/workflows/update-lkg.yml
@@ -19,6 +19,6 @@ jobs:
         npx hereby LKG
         npm test
         git diff
-        git add ./lib
+        git add --firce ./lib
         git commit -m "Update LKG"
         git push

From ffc7ea0fa49dc54cf91e2f22e53cd5207bb9fead Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Tue, 14 Mar 2023 09:45:17 -0700
Subject: [PATCH 2/4] Update .github/workflows/update-lkg.yml

---
 .github/workflows/update-lkg.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-lkg.yml b/.github/workflows/update-lkg.yml
index c52789ea1ccb1..10d41a88e402b 100644
--- a/.github/workflows/update-lkg.yml
+++ b/.github/workflows/update-lkg.yml
@@ -19,6 +19,6 @@ jobs:
         npx hereby LKG
         npm test
         git diff
-        git add --firce ./lib
+        git add --force ./lib
         git commit -m "Update LKG"
         git push

From 78000bbbc8c9b607080c95ab665df8f8b8469bae Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:09:53 -0700
Subject: [PATCH 3/4] revert package-lock change

---
 .github/workflows/set-version.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/set-version.yaml b/.github/workflows/set-version.yaml
index 227934c8c21b8..c1b221f01b88b 100644
--- a/.github/workflows/set-version.yaml
+++ b/.github/workflows/set-version.yaml
@@ -26,11 +26,11 @@ 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 install
+        npm ci
         npx hereby LKG
         npm test
         git diff
-        git add package.json package-lock.json
+        git add package.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

From 091c0683cc0504ea510b9801ad990d12f8464070 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:20:35 -0700
Subject: [PATCH 4/4] Add --force to new-release-branch, though it doesn't work

---
 .github/workflows/new-release-branch.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/new-release-branch.yaml b/.github/workflows/new-release-branch.yaml
index 9b5414a935b3e..3b438af82b7f1 100644
--- a/.github/workflows/new-release-branch.yaml
+++ b/.github/workflows/new-release-branch.yaml
@@ -28,7 +28,7 @@ jobs:
         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
         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'