From b1d3baaecd9a1515456460fd8445ebde9cc4ed9c Mon Sep 17 00:00:00 2001 From: Siglud Date: Thu, 21 Dec 2023 16:06:38 +0800 Subject: [PATCH 1/3] fix: rollback version change and add sleep --- .github/workflows/cd.yml | 1 + packages/fx-core/src/common/templates-config.json | 2 +- templates/package.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 4afc0c94ea..3e78126aed 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -124,6 +124,7 @@ jobs: - name: version change id: version-change run: | + sleep 60 echo "CHANGED=$(git tag --points-at HEAD | xargs)" >> $GITHUB_OUTPUT echo "TEMPLATE_VERSION=$(git tag --points-at HEAD | grep templates)" >> $GITHUB_OUTPUT echo "EXTENSION_VERSION=$(git tag --points-at HEAD | grep ms-teams-vscode-extension@)" >> $GITHUB_OUTPUT diff --git a/packages/fx-core/src/common/templates-config.json b/packages/fx-core/src/common/templates-config.json index fd40d07012..607a6ea698 100644 --- a/packages/fx-core/src/common/templates-config.json +++ b/packages/fx-core/src/common/templates-config.json @@ -1,5 +1,5 @@ { - "version": "~4.1", + "version": "0.0.0-rc", "tagPrefix": "templates@", "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt", "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download", diff --git a/templates/package.json b/templates/package.json index 173cb32273..1dfa3e959d 100644 --- a/templates/package.json +++ b/templates/package.json @@ -1,6 +1,6 @@ { "name": "templates", - "version": "4.1.1", + "version": "4.1.1-rc-hotfix.0", "private": "true", "license": "MIT", "scripts": { From 007af01f0120685e85284fa8a388e182581c5c24 Mon Sep 17 00:00:00 2001 From: Siglud Date: Thu, 21 Dec 2023 16:08:04 +0800 Subject: [PATCH 2/3] fix: fix command --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 3e78126aed..73aef6b8ed 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -128,7 +128,7 @@ jobs: echo "CHANGED=$(git tag --points-at HEAD | xargs)" >> $GITHUB_OUTPUT echo "TEMPLATE_VERSION=$(git tag --points-at HEAD | grep templates)" >> $GITHUB_OUTPUT echo "EXTENSION_VERSION=$(git tag --points-at HEAD | grep ms-teams-vscode-extension@)" >> $GITHUB_OUTPUT - git tag --points-at HEAD | grep templates | grep rc | xargs git push -d origin + git tag --points-at HEAD | grep templates | grep rc | xargs -r git push -d origin - name: update template rc tag uses: richardsimko/update-tag@v1.0.7 From c2061b3b2c1d858e754f83c0f6454d99e375d940 Mon Sep 17 00:00:00 2001 From: Siglud Date: Thu, 21 Dec 2023 16:10:23 +0800 Subject: [PATCH 3/3] fix: remove tag --- .github/workflows/cd.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 73aef6b8ed..14a03fc19b 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -124,11 +124,9 @@ jobs: - name: version change id: version-change run: | - sleep 60 echo "CHANGED=$(git tag --points-at HEAD | xargs)" >> $GITHUB_OUTPUT echo "TEMPLATE_VERSION=$(git tag --points-at HEAD | grep templates)" >> $GITHUB_OUTPUT echo "EXTENSION_VERSION=$(git tag --points-at HEAD | grep ms-teams-vscode-extension@)" >> $GITHUB_OUTPUT - git tag --points-at HEAD | grep templates | grep rc | xargs -r git push -d origin - name: update template rc tag uses: richardsimko/update-tag@v1.0.7