From e1fbff3ded87704fb0086f9b5fb368080eb4db51 Mon Sep 17 00:00:00 2001 From: Sean Brogan Date: Wed, 1 Apr 2020 00:14:37 -0700 Subject: .azurepipelines: Update CI steps Update CI steps to build base tools after setup and update, as basetools might have dependencies that need to be resolved. Cc: Sean Brogan Cc: Bret Barkelew Cc: Michael D Kinney Cc: Liming Gao Signed-off-by: Shenglei Zhang Reviewed-by: Liming Gao --- .azurepipelines/templates/pr-gate-steps.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to '.azurepipelines') diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml index a969661..3fcc1e8 100644 --- a/.azurepipelines/templates/pr-gate-steps.yml +++ b/.azurepipelines/templates/pr-gate-steps.yml @@ -39,11 +39,6 @@ steps: arguments: -c .pytool/CISettings.py -p ${{ parameters.build_pkgs }} --pr-target origin/$(System.PullRequest.targetBranch) --output-csv-format-string "##vso[task.setvariable variable=pkgs_to_build;isOutpout=true]{pkgcsv}" --output-count-format-string "##vso[task.setvariable variable=pkg_count;isOutpout=true]{pkgcount}" condition: eq(variables['Build.Reason'], 'PullRequest') -# build basetools -- template: basetools-build-steps.yml - parameters: - tool_chain_tag: ${{ parameters.tool_chain_tag }} - # install spell check prereqs - template: spell-check-prereq-steps.yml @@ -62,6 +57,13 @@ steps: arguments: -c .pytool/CISettings.py -p $(pkgs_to_build) -t ${{ parameters.build_targets}} -a ${{ parameters.build_archs}} TOOL_CHAIN_TAG=${{ parameters.tool_chain_tag}} condition: and(gt(variables.pkg_count, 0), succeeded()) +# build basetools +# do this after setup and update so that code base dependencies +# are all resolved. +- template: basetools-build-steps.yml + parameters: + tool_chain_tag: ${{ parameters.tool_chain_tag }} + - task: CmdLine@1 displayName: Build and Test ${{ parameters.build_pkgs }} ${{ parameters.build_archs}} inputs: -- cgit v1.1