revert pipeline back to one job

DeploymentFiles/deployment-pipeline.yml

@@ -22,7 +22,7 @@ variables:
   isPreRelease: false
 
 jobs:
-  - job: Build
+  - job: Build & Deploy
     steps:
     - task: UseDotNet@2
       displayName: 'Install .NET Core 6 SDK'
@@ -112,7 +112,7 @@ jobs:
         workingFolder: '$(Build.Repository.LocalPath)'
         arguments: '$(outputFolder) $(Build.Repository.LocalPath)'
         failOnStandardError: true
-    
+        
     - task: PowerShell@2
       displayName: 'Download dos2unix for line endings'
       inputs:
@@ -120,78 +120,69 @@ jobs:
         script: 'wget https://raidmax.org/downloads/dos2unix.exe'
         failOnStderr: true
         workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts'
-        
+            
-  - job: Transform
+    - task: CmdLine@2
-    dependsOn: Build
+      displayName: 'Convert Linux start script line endings'
-    steps:
+      inputs:
-      - task: CmdLine@2
+        script: |
-        displayName: 'Convert Linux start script line endings'
+          echo changing to encoding for linux start script
-        inputs:
+          dos2unix $(outputFolder)\StartIW4MAdmin.sh
-          script: |
+          dos2unix $(outputFolder)\UpdateIW4MAdmin.sh
-            echo changing to encoding for linux start script
+          echo creating website version filename
-            dos2unix $(outputFolder)\StartIW4MAdmin.sh
+          @echo IW4MAdmin-$(Build.BuildNumber) > $(Build.ArtifactStagingDirectory)\version_$(releaseType).txt
-            dos2unix $(outputFolder)\UpdateIW4MAdmin.sh
+        workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts'
-            echo creating website version filename
+    
-            @echo IW4MAdmin-$(Build.BuildNumber) > $(Build.ArtifactStagingDirectory)\version_$(releaseType).txt
+    - task: CopyFiles@2
-          workingDirectory: '$(Build.Repository.LocalPath)\Application\BuildScripts'
+      displayName: 'Move script plugins into publish directory'
-      
+      inputs:
-      - task: CopyFiles@2
+        SourceFolder: '$(Build.Repository.LocalPath)\Plugins\ScriptPlugins'
-        displayName: 'Move script plugins into publish directory'
+        Contents: '*.js'
-        inputs:
+        TargetFolder: '$(outputFolder)\Plugins'
-          SourceFolder: '$(Build.Repository.LocalPath)\Plugins\ScriptPlugins'
+    
-          Contents: '*.js'
+    - task: CopyFiles@2
-          TargetFolder: '$(outputFolder)\Plugins'
+      displayName: 'Move binary plugins into publish directory'
-      
+      inputs:
-      - task: CopyFiles@2
+        SourceFolder: '$(Build.Repository.LocalPath)\BUILD\Plugins\'
-        displayName: 'Move binary plugins into publish directory'
+        Contents: '*.dll'
-        inputs:
+        TargetFolder: '$(outputFolder)\Plugins'
-          SourceFolder: '$(Build.Repository.LocalPath)\BUILD\Plugins\'
+    
-          Contents: '*.dll'
+    - task: CmdLine@2
-          TargetFolder: '$(outputFolder)\Plugins'
+      displayName: 'Move webfront resources into publish directory'
-      
+      inputs:
-      - task: CmdLine@2
+       script: 'xcopy /s /y /f wwwroot $(outputFolder)\wwwroot'
-        displayName: 'Move webfront resources into publish directory'
+       workingDirectory: '$(Build.Repository.LocalPath)\BUILD\Plugins'
-        inputs:
+       failOnStderr: true
-         script: 'xcopy /s /y /f wwwroot $(outputFolder)\wwwroot'
+    
-         workingDirectory: '$(Build.Repository.LocalPath)\BUILD\Plugins'
+    - task: CmdLine@2
-         failOnStderr: true
+      displayName: 'Move gamescript files into publish directory'
-      
+      inputs:
-      - task: CmdLine@2
+       script: 'echo d | xcopy /s /y /f GameFiles $(outputFolder)\GameFiles'
-        displayName: 'Move gamescript files into publish directory'
+       workingDirectory: '$(Build.Repository.LocalPath)'
-        inputs:
+       failOnStderr: true
-         script: 'echo d | xcopy /s /y /f GameFiles $(outputFolder)\GameFiles'
+
-         workingDirectory: '$(Build.Repository.LocalPath)'
+    - task: ArchiveFiles@2
-         failOnStderr: true
+      displayName: 'Generate final zip file'
-         
+      inputs:
-  - job: Artifact
+        rootFolderOrFile: '$(outputFolder)'
-    dependsOn: Transform
+        includeRootFolder: false
-    steps:
+        archiveType: 'zip'
-      - task: ArchiveFiles@2
+        archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
-        displayName: 'Generate final zip file'
+        replaceExistingArchive: true
-        inputs:
+    
-          rootFolderOrFile: '$(outputFolder)'
+    - task: PublishPipelineArtifact@1
-          includeRootFolder: false
+      inputs:
-          archiveType: 'zip'
+        targetPath: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
-          archiveFile: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
+        artifact: 'IW4MAdmin-$(Build.BuildNumber).zip'
-          replaceExistingArchive: true
+        
-      
+    - task: PublishPipelineArtifact@1
-      - task: PublishPipelineArtifact@1
+      displayName: 'Publish artifact for analysis'
-        inputs:
+      inputs:
-          targetPath: '$(Build.ArtifactStagingDirectory)/IW4MAdmin-$(Build.BuildNumber).zip'
+        targetPath: '$(outputFolder)'
-          artifact: 'IW4MAdmin-$(Build.BuildNumber).zip'
+        artifact: 'IW4MAdmin.$(buildConfiguration)'
-          
+        publishLocation: 'pipeline'
-      - task: PublishPipelineArtifact@1
-        displayName: 'Publish artifact for analysis'
-        inputs:
-          targetPath: '$(outputFolder)'
-          artifact: 'IW4MAdmin.$(buildConfiguration)'
-          publishLocation: 'pipeline'
 
-  - job: Publish
-    dependsOn: Artifact
-    condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/develop'))
-    steps:
     - task: FtpUpload@2
+      condition: ne(variables['Build.SourceBranch'], 'refs/heads/develop')
       displayName: 'Upload zip file to website'
       inputs:
         credentialsOption: 'inputs'
@@ -207,6 +198,7 @@ jobs:
         trustSSL: false
     
     - task: FtpUpload@2
+      condition: ne(variables['Build.SourceBranch'], 'refs/heads/develop')
       displayName: 'Upload version info to website'
       inputs:
         credentialsOption: 'inputs'
@@ -222,6 +214,7 @@ jobs:
         trustSSL: false
     
     - task: GitHubRelease@1
+      condition: ne(variables['Build.SourceBranch'], 'refs/heads/develop')
       displayName: 'Make GitHub release'
       inputs:
         gitHubConnection: 'github.com_RaidMax'
@@ -239,6 +232,7 @@ jobs:
         changeLogType: 'commitBased'
     
     - task: PowerShell@2
+      condition: ne(variables['Build.SourceBranch'], 'refs/heads/develop')
       displayName: 'Update master version'
       inputs:
         targetType: 'inline'