From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.1970.1585729498191947746 for ; Wed, 01 Apr 2020 01:24:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: shenglei.zhang@intel.com) IronPort-SDR: icuoScjexzG//Sk4Rn+HZc9rdhEo0KlQsGaKOPjR3kZwY0IUc86gk4gOmwP0KBJ5SIxmiiKsbt wMih9RzafCPQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 01:24:57 -0700 IronPort-SDR: TrGEB4xo3ZJn4mc1fKIqgZoekglwmw4NwwY4Gas6zZXFUHzPJpkRWmr0MwlIfBm7TMK6a9YztZ umcDGjWKcOOA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,331,1580803200"; d="scan'208";a="252533115" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 01 Apr 2020 01:24:55 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Sean Brogan , Bret Barkelew , Michael D Kinney , Liming Gao Subject: [PATCH] .azurepipelines: Update CI steps Date: Wed, 1 Apr 2020 16:24:42 +0800 Message-Id: <20200401082442.22596-1-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 From: Sean Brogan 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 --- .azurepipelines/templates/pr-gate-steps.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.azurepipelines/templates/pr-gate-steps.yml b/.azurepipelines/templates/pr-gate-steps.yml index a969661dea15..3fcc1e88d804 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: -- 2.18.0.windows.1