Cleanup and refactor source-build pipeline job

Conflicts: azure-pipelines.yml
dotnet · Apr 16, 2021 · a0b4457 · a0b4457
1 parent 89ceb3a
commit a0b4457
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 29 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -148,6 +148,8 @@ jobs:
     configuration: Debug
     testArguments: --testCoreClr --helixQueueName OSX.1014.Amd64.Open
 
+- template: eng/common/templates/jobs/source-build.yml
+
 # Build Correctness Jobs
 
 - job: Correctness_Determinism
@@ -198,30 +200,6 @@ jobs:
         publishLocation: Container
       condition: succeeded()
 
-- job: Correctness_SourceBuild
-  pool:
-   name: NetCorePublic-Pool
-   queue: BuildPool.Ubuntu.1604.amd64.Open
-  timeoutInMinutes: 90
-  steps:
-    - template: eng/pipelines/checkout-unix-task.yml
-
-    - script: ./eng/cibuild.sh --configuration Debug --prepareMachine --binaryLog --sourceBuild
-      displayName: Build
-
-    - template: eng/pipelines/publish-logs.yml
-      parameters:
-        jobName: Correctness_SourceBuild
-        configuration: Release
-    - task: PublishBuildArtifacts@1
-      displayName: Publish Logs
-      inputs:
-        PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/Debug'
-        ArtifactName: 'SourceBuild_Test'
-        publishLocation: Container
-      continueOnError: true
-      condition: not(succeeded())
-
 - job: Correctness_Rebuild
   pool:
     name: NetCorePublic-Pool

diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
@@ -20,4 +20,14 @@
       Condition="'@(SourceBuildPatchFile)' != ''" />
   </Target>
 
+  <!--
+    The build script passes in the full path of the sln to build.  This must be overridden in order to build
+    the cloned source in the inner build.
+  -->
+  <Target Name="ConfigureInnerBuildArg" BeforeTargets="GetSourceBuildCommandConfiguration">
+    <PropertyGroup>
+      <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Compilers.sln"</InnerBuildArgs>
+    </PropertyGroup>
+  </Target>
+
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21126.2">
-      <Uri>https://github.com/dotnet/source-build</Uri>
-      <Sha>c06ae1212bd69e9fe52bed0b0a7d79cc8ea39054</Sha>
-      <SourceBuild RepoName="source-build" ManagedOnly="true" />
-    </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.21126.1">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
       <Sha>7e80445ee82adbf9a8e6ae601ac5e239d982afaa</Sha>

diff --git a/eng/build.sh b/eng/build.sh
@@ -229,6 +229,9 @@ function MakeBootstrapBuild {
 }
 
 function BuildSolution {
+  local solution="Compilers.sln"
+  echo "$solution:"
+
   InitializeToolset
   local toolset_build_proj=$_InitializeToolset
 
@@ -238,6 +241,8 @@ function BuildSolution {
     export RoslynCommandLineLogFile="$log_dir/vbcscompiler.log"
   fi
 
+  local projects="$repo_root/$solution"
+
   UNAME="$(uname)"
   # NuGet often exceeds the limit of open files on Mac and Linux
   # https://github.com/NuGet/Home/issues/2163
@@ -288,6 +293,7 @@ function BuildSolution {
   MSBuild $toolset_build_proj \
     $bl \
     /p:Configuration=$configuration \
+    /p:Projects="$projects" \
     /p:RepoRoot="$repo_root" \
     /p:Restore=$restore \
     /p:Build=$build \