From 0f092544d1f760d6be641e46a7a3c208e957cbdf Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 10 Feb 2021 12:07:56 -0800
Subject: [PATCH] [release/2.1] Clean up YAML slightly (#29737)
- get `buildArgs` parameter to default-build.yml template working
- nothing uses this at the moment (now that pr-validation-temp.yml is no more)
- but, it's documented and can be useful
- remove unused `buildScript` parameter
- remove unused project-ci.yml template
---
.azure/pipelines/jobs/default-build.yml | 5 ++-
.azure/pipelines/project-ci.yml | 60 -------------------------
2 files changed, 3 insertions(+), 62 deletions(-)
delete mode 100644 .azure/pipelines/project-ci.yml
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 30739aef4b0..41f01d7afac 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -54,6 +54,7 @@ parameters:
publish: true
path: 'artifacts/'
buildDirectory: ''
+ buildArgs: ''
jobs:
- job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
@@ -84,7 +85,7 @@ jobs:
queue: BuildPool.Server.Amd64.VS2017
variables:
AgentOsName: ${{ parameters.agentOs }}
- BuildScript: ${{ parameters.buildScript }}
+ BuildScriptArgs: ${{ parameters.buildArgs }}
BuildConfiguration: ${{ parameters.configuration }}
BuildDirectory: ${{ parameters.buildDirectory }}
BinlogArg: /bl:artifacts/logs/${{ parameters.agentOs }}.binlog
@@ -186,4 +187,4 @@ jobs:
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}:
- task: MicroBuildCleanup@1
displayName: Cleanup MicroBuild tasks
- condition: always()
\ No newline at end of file
+ condition: always()
diff --git a/.azure/pipelines/project-ci.yml b/.azure/pipelines/project-ci.yml
deleted file mode 100644
index 0fc6147fb6d..00000000000
--- a/.azure/pipelines/project-ci.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# Description: Runs build.cmd/sh on macOS, Linux, and Windows
-# Parameters:
-# buildArgs: string
-# Additional arguments to pass to the build.sh/cmd script.
-# Note: -ci is always passed
-# beforeBuild: [steps]
-# Additional steps to run before build.sh/cmd
-# afterBuild: [steps]
-# Additional steps to run after build.sh/cmd
-# variables: {}
-# VSTS build and environment variables
-# matrix: {}
-# The matrix of configurations to run. By default, it runs a Debug and Release build on all platforms
-# codeSign: boolean
-# This build definition is enabled for code signing. (Only applies to Windows)
-# buildDirectory: string
-# Specifies what directory to run build.sh/cmd
-
-parameters:
- buildArgs: ''
- beforeBuild: []
- afterBuild: []
- codeSign: false
- variables: {}
- matrix:
- Release:
- BuildConfiguration: Release
- Debug:
- BuildConfiguration: Debug
- buildDirectory: ''
-
-jobs:
-- template: jobs/default-build.yml
- parameters:
- agentOs: Windows
- matrix: ${{ parameters.matrix }}
- buildArgs: ${{ parameters.buildArgs }}
- beforeBuild: ${{ parameters.beforeBuild }}
- afterBuild: ${{ parameters.afterBuild }}
- codeSign: ${{ parameters.codeSign }}
- variables: ${{ parameters.variables }}
- buildDirectory: ${{ parameters.buildDirectory }}
-- template: jobs/default-build.yml
- parameters:
- agentOs: macOS
- matrix: ${{ parameters.matrix }}
- buildArgs: ${{ parameters.buildArgs }}
- beforeBuild: ${{ parameters.beforeBuild }}
- afterBuild: ${{ parameters.afterBuild }}
- variables: ${{ parameters.variables }}
- buildDirectory: ${{ parameters.buildDirectory }}
-- template: jobs/default-build.yml
- parameters:
- agentOs: Linux
- matrix: ${{ parameters.matrix }}
- buildArgs: ${{ parameters.buildArgs }}
- beforeBuild: ${{ parameters.beforeBuild }}
- afterBuild: ${{ parameters.afterBuild }}
- variables: ${{ parameters.variables }}
- buildDirectory: ${{ parameters.buildDirectory }}
\ No newline at end of file
--
GitLab