From 97b25729b6b3d790e8d7d203b4c39d02d41e8b29 Mon Sep 17 00:00:00 2001
From: chrisism <cwjungerius@gmail.com>
Date: Tue, 11 Oct 2022 15:17:42 +0200
Subject: [PATCH] Separated checkout and clone

---
 .build/main.yml                             | 2 +-
 .build/publish_in_kodi_repository_steps.yml | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.build/main.yml b/.build/main.yml
index de2425a..fa3930b 100644
--- a/.build/main.yml
+++ b/.build/main.yml
@@ -208,7 +208,7 @@ stages:
      
 - stage: DeployStaging
   displayName: Deployment on Staging
-  condition: or(eq(${{variables.isReleaseCandidate}}, true),eq(${{variables.isHotfix}}, true),eq(${{variables.isMaster}}, true))
+  condition: and(succeeded(), or(eq(${{variables.isReleaseCandidate}}, true),eq(${{variables.isHotfix}}, true),eq(${{variables.isMaster}}, true)))
   jobs:
     - deployment: Staging
       environment: 
diff --git a/.build/publish_in_kodi_repository_steps.yml b/.build/publish_in_kodi_repository_steps.yml
index 769766d..184beb4 100644
--- a/.build/publish_in_kodi_repository_steps.yml
+++ b/.build/publish_in_kodi_repository_steps.yml
@@ -6,10 +6,15 @@
 steps:
   - script: |
       git clone https://$(kodi_repository_url)
-      git checkout $(kodi_branch_name)
     workingDirectory: $(Pipeline.Workspace)/
     displayName: 'Clone git repository for kodi repository'
 
+  - script: |
+      git fetch --all
+      git checkout $(kodi_branch_name)
+    workingDirectory: $(Pipeline.Workspace)/$(kodi_repository_name)
+    displayName: 'Fetch and checkout correct branch for kodi repository'
+
   - script: |
       git config user.email $(git_emailAddress)
       git config user.name $(git_userName)