[Azure Pipelines] Adjust jobs

Warzone2100 · Feb 13, 2021 · 575929e · 575929e
1 parent 241cf69
commit 575929e
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 53 deletions.
diff --git a/.ci/azure/templates/macos-build-pipeline-template.yml b/.ci/azure/templates/macos-build-pipeline-template.yml
@@ -26,11 +26,11 @@ parameters:
   default: false
 - name: artifact
   default: 'warzone2100_macOS'
-- name: uploadArtifactToGitHubReleases
-  type: boolean
-  default: false
-- name: gitHubConnection
-  default: ''
+# - name: uploadArtifactToGitHubReleases
+#   type: boolean
+#   default: false
+# - name: gitHubConnection
+#   default: ''
 
 jobs:
 - job: ${{ parameters.name }}
@@ -218,19 +218,19 @@ jobs:
     inputs:
       targetPath: '$(Build.ArtifactStagingDirectory)'
       artifact: ${{ parameters.artifact }}
-  - task: GithubRelease@1
-    displayName: 'Upload to GitHub Release'
-    condition: and(succeeded(), eq('${{ parameters.uploadArtifactToGitHubReleases }}', true), ne('${{ parameters.gitHubConnection }}', ''), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
-    inputs:
-      gitHubConnection: ${{ parameters.gitHubConnection }}
-      action: edit
-      tagSource: userSpecifiedTag
-      # We can't use Build.SourceBranchName because:
-      # - "Build.SourceBranchName does not include full name, if name includes forward slash"
-      # - Link: https://github.com/microsoft/azure-pipelines-agent/issues/838
-      tag: $(FULL_SOURCE_BRANCH_NAME)
-      assets: |
-        $(Build.ArtifactStagingDirectory)/*.zip
-      assetUploadMode: 'replace'
-      isDraft: true
-      addChangeLog: false
+  # - task: GithubRelease@1
+  #   displayName: 'Upload to GitHub Release'
+  #   condition: and(succeeded(), eq('${{ parameters.uploadArtifactToGitHubReleases }}', true), ne('${{ parameters.gitHubConnection }}', ''), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
+  #   inputs:
+  #     gitHubConnection: ${{ parameters.gitHubConnection }}
+  #     action: edit
+  #     tagSource: userSpecifiedTag
+  #     # We can't use Build.SourceBranchName because:
+  #     # - "Build.SourceBranchName does not include full name, if name includes forward slash"
+  #     # - Link: https://github.com/microsoft/azure-pipelines-agent/issues/838
+  #     tag: $(FULL_SOURCE_BRANCH_NAME)
+  #     assets: |
+  #       $(Build.ArtifactStagingDirectory)/*.zip
+  #     assetUploadMode: 'replace'
+  #     isDraft: true
+  #     addChangeLog: false
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -31,35 +31,27 @@ jobs:
     includeVideos: false
     publishArtifact: true
     artifact: 'warzone2100_macOS_novideos'
-    # Upload this macOS job's output to GitHub Releases
-    uploadArtifactToGitHubReleases: true
-    gitHubConnection: 'githubReleases'
-    #
-- template: .ci/azure/templates/macos-build-pipeline-template.yml
-  parameters:
-    name: macOS_Xcode_10_3
-    displayName: 'macOS [Xcode 10.3, macOS 10.14 SDK] - full'  # friendly name to display in the UI
-    vmImage: 'macOS-10.14'
-    xcodeDeveloperDir: '/Applications/Xcode_10.3.app/Contents/Developer' # Set default Xcode to Xcode 10.3 on macOS 10.14
-    vcpkgBuildXcodeDeveloperDir: '/Applications/Xcode_11.7.app/Contents/Developer'
-    includeVideos: true
-    publishArtifact: true
-    artifact: 'warzone2100_macOS'
-    # Upload this macOS job's output to GitHub Releases
-    uploadArtifactToGitHubReleases: true
-    gitHubConnection: 'githubReleases'
-    #
-- template: .ci/azure/templates/macos-build-pipeline-template.yml
-  parameters:
-    name: macOS_Xcode_11
-    displayName: 'macOS [Xcode 11.7, macOS 10.15 SDK]'  # friendly name to display in the UI
-    vmImage: 'macOS-10.15'
-    xcodeDeveloperDir: '/Applications/Xcode_11.7.app/Contents/Developer'
-    publishArtifact: false
-- template: .ci/azure/templates/macos-build-pipeline-template.yml
-  parameters:
-    name: macOS_latest
-    displayName: 'macOS [vmImage: macOS-latest]'  # friendly name to display in the UI
-    vmImage: 'macOS-latest'
-    publishArtifact: true
-    artifact: 'warzone2100_macOS (latest)'
+# - template: .ci/azure/templates/macos-build-pipeline-template.yml
+#   parameters:
+#     name: macOS_Xcode_10_3
+#     displayName: 'macOS [Xcode 10.3, macOS 10.14 SDK] - full'  # friendly name to display in the UI
+#     vmImage: 'macOS-10.14'
+#     xcodeDeveloperDir: '/Applications/Xcode_10.3.app/Contents/Developer' # Set default Xcode to Xcode 10.3 on macOS 10.14
+#     vcpkgBuildXcodeDeveloperDir: '/Applications/Xcode_11.7.app/Contents/Developer'
+#     includeVideos: true
+#     publishArtifact: true
+#     artifact: 'warzone2100_macOS'
+# - template: .ci/azure/templates/macos-build-pipeline-template.yml
+#   parameters:
+#     name: macOS_Xcode_11
+#     displayName: 'macOS [Xcode 11.7, macOS 10.15 SDK]'  # friendly name to display in the UI
+#     vmImage: 'macOS-10.15'
+#     xcodeDeveloperDir: '/Applications/Xcode_11.7.app/Contents/Developer'
+#     publishArtifact: false
+# - template: .ci/azure/templates/macos-build-pipeline-template.yml
+#   parameters:
+#     name: macOS_latest
+#     displayName: 'macOS [vmImage: macOS-latest]'  # friendly name to display in the UI
+#     vmImage: 'macOS-latest'
+#     publishArtifact: true
+#     artifact: 'warzone2100_macOS (latest)'