fix switch to target branch ci step (#4636)

microsoft · Feb 20, 2024 · d822230 · d822230
1 parent 775ceba
commit d822230
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/.azure-pipelines/build-job.yml b/.azure-pipelines/build-job.yml
@@ -99,11 +99,10 @@ jobs:
   - checkout: self
     clean: true
 
-  - task: PowerShell@2
-    displayName: 'Switch to target branch'
+  - task: Bash@3
+    displayName: Switch to target branch
     inputs:
-      targetType: 'filePath'
-      filePath: .azure-pipelines/scripts/Switch-Branch.ps1
+      filePath: .azure-pipelines/scripts/switch-branch.sh
     env:
       TARGET_BRANCH: $(CheckoutBranch)
     condition: |

diff --git a/.azure-pipelines/scripts/Switch-Branch.ps1 b/.azure-pipelines/scripts/Switch-Branch.ps1
diff --git a/.azure-pipelines/scripts/switch-branch.sh b/.azure-pipelines/scripts/switch-branch.sh
@@ -0,0 +1,11 @@
+git config user.email "azure-pipelines-bot@microsoft.com"
+git config user.name "azure-pipelines-bot"
+
+git checkout -f origin/$TARGET_BRANCH
+
+last_exit_code=$?
+
+if [[ $last_exit_code != 0 ]]; then
+    echo "git checkout failed with exit code $last_exit_code"
+    exit 1
+fi
diff --git a/.vsts.release.yml b/.vsts.release.yml
@@ -172,11 +172,10 @@ extends:
           - checkout: self
             clean: true
 
-          - task: PowerShell@2
-            displayName: 'Switch to release branch'
+          - task: Bash@3
+            displayName: Switch to release branch
             inputs:
-              targetType: 'filePath'
-              filePath: .azure-pipelines/scripts/Switch-Branch.ps1
+              filePath: .azure-pipelines/scripts/switch-branch.sh
             env:
               TARGET_BRANCH: $(ReleaseBranch)