.azurepipelines/templates/pr-gate-steps.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
From: Sean Brogan <sean.brogan@microsoft.com>
Update CI steps to build base tools after setup and update,
as basetools might have dependencies that need to be resolved.
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
.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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#56819): https://edk2.groups.io/g/devel/message/56819
Mute This Topic: https://groups.io/mt/72695867/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Liming Gao <liming.gao@intel.com> > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Zhang, Shenglei > Sent: Wednesday, April 1, 2020 4:25 PM > To: devel@edk2.groups.io > Cc: Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Kinney, Michael D > <michael.d.kinney@intel.com>; Gao, Liming <liming.gao@intel.com> > Subject: [edk2-devel] [PATCH] .azurepipelines: Update CI steps > > From: Sean Brogan <sean.brogan@microsoft.com> > > Update CI steps to build base tools after setup and update, > as basetools might have dependencies that need to be resolved. > > Cc: Sean Brogan <sean.brogan@microsoft.com> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com> > Cc: Michael D Kinney <michael.d.kinney@intel.com> > Cc: Liming Gao <liming.gao@intel.com> > Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com> > --- > .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 > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56930): https://edk2.groups.io/g/devel/message/56930 Mute This Topic: https://groups.io/mt/72695867/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.