From baaf10338d6fbdb95c704da4ebdf9bf9de14e102 Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Fri, 7 Jan 2022 09:28:36 -0800 Subject: [PATCH] update publish types (#17953) * update-type build definition * more updates * comments * fix path * folder change * test change * test update script * revert test changes --- .../publish-types/publish-types.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/build/azure-pipelines/publish-types/publish-types.yml b/build/azure-pipelines/publish-types/publish-types.yml index f83971d31e..1a6fd8baaa 100644 --- a/build/azure-pipelines/publish-types/publish-types.yml +++ b/build/azure-pipelines/publish-types/publish-types.yml @@ -44,17 +44,20 @@ steps: git config --global user.name "Azure Data Studio" git clone https://$(GITHUB_TOKEN)@$(REPO) --depth=1 - node build/azure-pipelines/publish-types/update-types.js - - TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`) - cd DefinitelyTyped # Sync up to latest from the DT repo git remote add upstream https://github.com/DefinitelyTyped/DefinitelyTyped.git git fetch upstream - git merge upstream/master - git push origin + git reset --hard upstream/master + git push --force + + # Update the type + cd .. + node build/azure-pipelines/publish-types/update-types.js + + cd DefinitelyTyped + TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`) git diff --color | cat git add -A