From 1ef043bd9716dfe782042ee75663e3c257d87bf8 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Fri, 30 Sep 2022 15:20:56 -0500
Subject: [PATCH] Enable online and offline source-build tarball build in all
 PRs (#14620)

---
 .vsts-ci.yml                                         |  8 ++++----
 .../templates/job/source-build-create-tarball.yml    | 12 ------------
 .../templates/job/source-build-run-tarball-build.yml | 12 ++++++------
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 386a36047..abfd68fda 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -332,10 +332,10 @@ stages:
 
   - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
 
-  - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
-    parameters:
-      dependsOn: Source_Build_Create_Tarball
-      condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true')
+  - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
+    - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
+      parameters:
+        dependsOn: Source_Build_Create_Tarball
 
   # https://github.com/dotnet/core-sdk/issues/248
   # - template: /eng/build.yml
diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
index db3657cd9..cffdf6bdb 100644
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
@@ -74,15 +74,3 @@ jobs:
     displayName: Publish BuildLogs
     continueOnError: true
     condition: succeededOrFailed()
-
-  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
-    # Check if the tarball should be built now so the result can be used in the build tarball job condition.
-    # This prevents allocation of additional agents if the tarball build legs should be skipped.
-    # Only build the tarball if the PR touches source-build source.
-    - script: |
-        if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*'
-        then
-          echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true"
-        fi
-      displayName: Tarball Build Check
-      name: Tarball_Build_Check
diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
index c4a8c3126..dd39d4e2d 100644
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
@@ -42,13 +42,13 @@ jobs:
         _EnablePoison: false
         _ExcludeOmniSharpTests: true
         _RunOnline: true
+      CentOSStream8-Offline:
+        _BootstrapPrep: false
+        _Container: ${{ parameters.centOSStream8Container }}
+        _EnablePoison: false
+        _ExcludeOmniSharpTests: true
+        _RunOnline: false
       ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-        CentOSStream8-Offline:
-          _BootstrapPrep: false
-          _Container: ${{ parameters.centOSStream8Container }}
-          _EnablePoison: false
-          _ExcludeOmniSharpTests: true
-          _RunOnline: false
         CentOSStream9-Offline:
           _BootstrapPrep: false
           _Container: ${{ parameters.centOSStream9Container }}