From 8fb07613336bd2f7659484580d5f4505b54061a4 Mon Sep 17 00:00:00 2001
From: darangi <small_musa@hotmail.com>
Date: Thu, 27 May 2021 17:05:52 +0100
Subject: [PATCH] reset ci configs to default

---
 script/vsts/get-release-version.js   | 1 -
 script/vsts/platforms/macos.yml      | 4 ++--
 script/vsts/platforms/windows.yml    | 8 ++++----
 script/vsts/release-branch-build.yml | 7 +++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/script/vsts/get-release-version.js b/script/vsts/get-release-version.js
index a24e5d821..4e8999d72 100644
--- a/script/vsts/get-release-version.js
+++ b/script/vsts/get-release-version.js
@@ -76,7 +76,6 @@ async function getReleaseVersion() {
     !isReleaseBranch &&
     (process.env.IS_SIGNED_ZIP_BRANCH ||
       buildBranch.startsWith('electron-') ||
-      buildBranch.startsWith('migrate-') ||
       (buildBranch === 'master' &&
         !process.env.SYSTEM_PULLREQUEST_PULLREQUESTNUMBER));
   const SHOULD_SIGN = process.env.SHOULD_SIGN;
diff --git a/script/vsts/platforms/macos.yml b/script/vsts/platforms/macos.yml
index 17093c0fb..52ea6ae94 100644
--- a/script/vsts/platforms/macos.yml
+++ b/script/vsts/platforms/macos.yml
@@ -6,8 +6,8 @@ jobs:
 
     variables:
       ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-      IsReleaseBranch: false
-      IsSignedZipBranch: true
+      IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
+      IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
       RunCoreMainTests: true
     pool:
       vmImage: macos-10.15
diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml
index 095e63986..0e422c92c 100644
--- a/script/vsts/platforms/windows.yml
+++ b/script/vsts/platforms/windows.yml
@@ -19,8 +19,8 @@ jobs:
     variables:
       AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ]
       ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-      IsReleaseBranch: false
-      IsSignedZipBranch: true
+      IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
+      IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
     steps:
       - template: templates/preparation.yml
@@ -89,8 +89,8 @@ jobs:
     variables:
       AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ]
       ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-      IsReleaseBranch: false
-      IsSignedZipBranch: true
+      IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
+      IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
     steps:
       - template: templates/preparation.yml
diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml
index 8056421e2..e2e2823e4 100644
--- a/script/vsts/release-branch-build.yml
+++ b/script/vsts/release-branch-build.yml
@@ -2,8 +2,7 @@ trigger:
   - master
   - 1.* # VSTS only supports wildcards at the end
   - electron-*
-  - migrate-to-azure-storage
-pr: none # no PR triggers
+pr: pr # temporarily enable pr trigger
 
 jobs:
   # Import "GetReleaseVersion" job definition
@@ -30,8 +29,8 @@ jobs:
 
     variables:
       ReleaseVersion: $[ dependencies.GetReleaseVersion.outputs['Version.ReleaseVersion'] ]
-      IsReleaseBranch: false
-      IsSignedZipBranch: true
+      IsReleaseBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsReleaseBranch'] ]
+      IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
     steps:
       - template: platforms/templates/preparation.yml