From 00d7d5272912a1cd56568cc76a7bfe88379e0296 Mon Sep 17 00:00:00 2001 From: Andrew Casey Date: Wed, 19 Aug 2020 17:57:22 -0700 Subject: [PATCH] Git ignore package-lock.json and forcibly update in workflow --- .github/workflows/update-package-lock.yaml | 2 +- .gitignore | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update-package-lock.yaml b/.github/workflows/update-package-lock.yaml index b0704167f85..5073de005c3 100644 --- a/.github/workflows/update-package-lock.yaml +++ b/.github/workflows/update-package-lock.yaml @@ -22,6 +22,6 @@ jobs: git config user.email "ts_bot@rcavanaugh.com" git config user.name "TypeScript Bot" npm install --package-lock-only - git add package-lock.json + git add -f package-lock.json git commit -m "Update package-lock.json" git push diff --git a/.gitignore b/.gitignore index 45ff34319c3..d2bfafe567f 100644 --- a/.gitignore +++ b/.gitignore @@ -84,6 +84,7 @@ tests/cases/user/*/**/*.d.ts tests/baselines/reference/dt .failed-tests TEST-results.xml +package-lock.json tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter