combine publish for all OS

script/vsts/platforms/linux.yml

@@ -25,4 +25,15 @@ jobs:
 
       - template: templates/linux-test.yml
 
-      - template: templates/linux-publish.yml
+      - template: templates/publish.yml
+        parameters:
+          artifacts:
+            - filename: atom.x86_64.rpm
+              dir: $(Build.SourcesDirectory)/out
+              condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+            - filename: atom-amd64.deb
+              dir: $(Build.SourcesDirectory)/out
+              condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+            - filename: atom-amd64.tar.gz
+              dir: $(Build.SourcesDirectory)/out
+              condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))

script/vsts/platforms/macos.yml

@@ -25,7 +25,22 @@ jobs:
 
       - template: templates/macos-build.yml
 
-      - template: templates/macos-publish.yml
+      - script: |
+          cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory)
+        displayName: Stage Artifacts
+
+      - template: templates/publish.yml
+        parameters:
+          artifacts:
+            - filename: atom-mac.zip
+              dir: $(Build.ArtifactStagingDirectory)
+              condition: succeeded()
+            - filename: atom-mac-symbols.zip
+              dir: $(Build.ArtifactStagingDirectory)
+              condition: succeeded()
+            - filename: atom-api.json
+              dir: $(Build.SourcesDirectory)/docs/output
+              condition: succeeded()
 
   - job: macOS_tests
     displayName: macOS test

script/vsts/platforms/templates/linux-publish.yml

@@ -1,24 +0,0 @@
-steps:
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom.x86_64.rpm
-      ArtifactName: atom.x86_64.rpm
-      ArtifactType: Container
-    displayName: Upload atom.x84_64.rpm
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.deb
-      ArtifactName: atom-amd64.deb
-      ArtifactType: Container
-    displayName: Upload atom-amd64.deb
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom-amd64.tar.gz
-      ArtifactName: atom-amd64.tar.gz
-      ArtifactType: Container
-    displayName: Upload atom-amd64.tar.gz
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))

script/vsts/platforms/templates/macos-publish.yml

@@ -1,28 +0,0 @@
-steps:
-  - script: |
-      cp $(Build.SourcesDirectory)/out/*.zip $(Build.ArtifactStagingDirectory)
-    displayName: Stage Artifacts
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac.zip
-      ArtifactName: atom-mac.zip
-      ArtifactType: Container
-    displayName: Upload atom-mac.zip
-    condition: succeeded()
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)/atom-mac-symbols.zip
-      ArtifactName: atom-mac-symbols.zip
-      ArtifactType: Container
-    displayName: Upload atom-mac-symbols.zip
-    condition: succeeded()
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/docs/output/atom-api.json
-      ArtifactName: atom-api.json
-      ArtifactType: Container
-    displayName: Upload atom-api.json
-    condition: succeeded()

script/vsts/platforms/templates/publish.yml

@@ -0,0 +1,16 @@
+parameters:
+  - name: artifacts
+    type: object
+
+steps:
+  - ${{ each artifact in parameters.artifacts }}:
+    - task: PublishBuildArtifacts@1
+      inputs:
+        PathtoPublish: ${{artifact.dir}}/${{artifact.filename}}
+        ArtifactName: ${{artifact.filename}}
+        ArtifactType: Container
+      displayName: Upload ${{artifact.filename}}
+      ${{ if artifact.condition }}:
+        condition: ${{artifact.condition}}
+      ${{ if artifact.continueOnError }}:
+        continueOnError: ${{artifact.continueOnError}}

script/vsts/platforms/templates/windows-publish.yml

@@ -1,52 +0,0 @@
-steps:
-  - script: |
-      IF [%BUILD_ARCH%]==[x64] (
-        SET FileID=-x64
-      ) ELSE (
-        SET FileID=
-      )
-      echo FileID set to: %FileID%
-    env:
-      BUILD_ARCH: $(buildArch)
-    displayName: Set FileID based on the arch
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/atom$(FileID)-windows.zip
-      ArtifactName: atom$(FileID)-windows.zip
-      ArtifactType: Container
-    displayName: Upload atom$(FileID)-windows.zip
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/AtomSetup$(FileID).exe
-      ArtifactName: AtomSetup$(FileID).exe
-      ArtifactType: Container
-    displayName: Upload AtomSetup$(FileID).exe
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/$(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg
-      ArtifactName: $(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg
-      ArtifactType: Container
-    displayName: Upload $(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/$(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg
-      ArtifactName: $(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg
-      ArtifactType: Container
-    displayName: Upload $(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
-    continueOnError: true # Nightly builds don't produce delta packages yet, so don't fail the build
-
-  - task: PublishBuildArtifacts@1
-    inputs:
-      PathtoPublish: $(Build.SourcesDirectory)/out/RELEASES$(FileID)
-      ArtifactName: RELEASES$(FileID)
-      ArtifactType: Container
-    displayName: Upload RELEASES$(FileID)
-    condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))

script/vsts/platforms/windows.yml

@@ -37,4 +37,33 @@ jobs:
 
       - template: templates/windows-test.yml
 
-      - template: templates/windows-publish.yml
+      - script: |
+          IF [%BUILD_ARCH%]==[x64] (
+            SET FileID=-x64
+          ) ELSE (
+            SET FileID=
+          )
+          echo FileID set to: %FileID%
+        env:
+          BUILD_ARCH: $(buildArch)
+        displayName: Set FileID based on the arch
+
+      - template: templates/publish.yml
+        parameters:
+          artifacts:
+            - filename: atom$(FileID)-windows.zip
+              dir: $(Build.SourcesDirectory)/out
+              condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
+            - filename: AtomSetup$(FileID).exe
+              dir: $(Build.SourcesDirectory)/out
+              condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
+            - filename: $(AppName)$(FileID)-$(ReleaseVersion)-full.nupkg
+              dir: $(Build.SourcesDirectory)/out
+              condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
+            - filename: $(AppName)$(FileID)-$(ReleaseVersion)-delta.nupkg
+              dir: $(Build.SourcesDirectory)/out
+              condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))
+              continueOnError: true # Nightly builds don't produce delta packages yet, so don't fail the build
+            - filename: RELEASES$(FileID)
+              dir: $(Build.SourcesDirectory)/out
+              condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))