From 9ae3f09435871e236b42afbc403e4a1d5544e07b Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Wed, 28 Dec 2022 15:32:04 +1000
Subject: [PATCH] pipeline file changes

---
 .azure/pipelines/azure-pipelines-deploy.yml | 40 +++++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/.azure/pipelines/azure-pipelines-deploy.yml b/.azure/pipelines/azure-pipelines-deploy.yml
index b6659669..e36e078b 100644
--- a/.azure/pipelines/azure-pipelines-deploy.yml
+++ b/.azure/pipelines/azure-pipelines-deploy.yml
@@ -56,9 +56,31 @@ stages:
             - template: output-environment-variables.yml@self
 
             - checkout: MasterRepo
-              path: 'repo'
               persistCredentials: true
 
+            - task: PowerShell@2
+              displayName: Pull Master Repository Files
+              env:
+                DEPLOY_BUILDNUMBER: $(Build.BuildNumber)
+                DEPLOY_SOURCESDIRECTORY: $(Build.SourcesDirectory)
+              inputs:
+                targetType: inline
+                script: |
+                  Write-Host "Setting up the global configuration"
+                  git config --global user.email "${{parameters.GitEmail}}"
+                  git config --global user.name "${{parameters.GitUsername}}"
+
+                  Write-Host "Setting up the configuration"
+                  git config pull.rebase false
+
+                  Write-Host "Performing Git Checkout"
+                  git checkout -b master
+
+                  Write-Host "Performing a Git Pull"
+                  git pull --force
+                pwsh: true
+                workingDirectory: '$(Build.SourcesDirectory)'
+
             - task: PowerShell@2
               displayName: Copy ${{parameters.DeploymentType}} Files
               env:
@@ -102,6 +124,7 @@ stages:
 
             - task: PowerShell@2
               displayName: Commit ${{parameters.DeploymentType}} Files
+              enabled: false
               env:
                 DEPLOY_BUILDNUMBER: $(Build.BuildNumber)
                 DEPLOY_SOURCESDIRECTORY: $(Build.SourcesDirectory)
@@ -115,8 +138,11 @@ stages:
                   git config --global user.email "${{parameters.GitEmail}}"
                   git config --global user.name "${{parameters.GitUsername}}"
 
-                  Write-Host "Performing Git Checkout"
-                  git checkout -b master
+                  Write-Host "Setting up the configuration"
+                  git config pull.rebase false
+
+                  #Write-Host "Performing Git Checkout"
+                  #git checkout -b master
 
                   Write-Host "Performing Git Add"
                   git add -A
@@ -190,8 +216,8 @@ stages:
 
             - template: azure-pipelines-clean-agent.yml@self
               parameters:
-                CleanArtifactsFolder: true
-                CleanBinariesFolder: true
-                CleanSourcesFolder: true
-                CleanPublishFolder: true
+                CleanArtifactsFolder: false
+                CleanBinariesFolder: false
+                CleanSourcesFolder: false
+                CleanPublishFolder: false
                 PublishFolder: $(PublishFolder)