Address follow-up feedback from dotnet#1934 (dotnet#2028)

* Address follow-up feedback from dotnet#1934 * Remove whitespaces
monojenkins · Jan 23, 2020 · 03f8ed5 · 03f8ed5
1 parent 879e596
commit 03f8ed5
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 17 deletions.
diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
@@ -90,7 +90,7 @@ jobs:
         # alpine coreclr cmake errors on newer builds
         ${{ if eq(parameters.runtimeFlavor, 'mono') }}:
           image: alpine-3.9-WithNode-0fc54a3-20200121145958
-        ${{ if ne(parameters.runtimeFlavor, 'mono') }}:
+        ${{ if eq(parameters.runtimeFlavor, 'coreclr') }}:
           image: alpine-3.9-WithNode-0fc54a3-20190918214015
         registry: mcr
       jobParameters:

diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
@@ -50,12 +50,11 @@ jobs:
         - name: ROOTFS_DIR
           value: ${{ parameters.jobParameters.crossrootfsDir }}
 
-      - ${{ if ne(parameters.jobParameters.runtimeFlavor, '') }}:
-        - name: runtimeFlavorName
-          ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
-            value: Mono
-          ${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}:
-            value: CoreCLR
+      - name: runtimeFlavorName
+        ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
+          value: Mono
+        ${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}:
+          value: CoreCLR
 
     osGroup: ${{ parameters.osGroup }}
     osSubgroup: ${{ parameters.osSubgroup }}

diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml
@@ -83,7 +83,7 @@ jobs:
 
         - ${{ if eq(parameters.osGroup, 'OSX') }}:
           - script: |
-              brew install pkgconfig icu4c openssl autoconf automake libtool pkg-config python3
+              brew install pkgconfig icu4c openssl
               brew link --force icu4c
               ln -s /usr/local/opt/openssl/lib/pkgconfig/libcrypto.pc /usr/local/lib/pkgconfig/
               ln -s /usr/local/opt/openssl/lib/pkgconfig/libssl.pc /usr/local/lib/pkgconfig/

diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml
@@ -6,7 +6,6 @@ parameters:
   platform: ''
   container: ''
   timeoutInMinutes: ''
-  stagedBuild: false
   variables: {}
   pool: ''
   condition: true
@@ -16,13 +15,11 @@ jobs:
 - template: xplat-pipeline-job.yml
   parameters:
     buildConfig: ${{ parameters.buildConfig }}
-    _BuildConfig: ${{ parameters.buildConfig }}
     archType: ${{ parameters.archType }}
     osGroup: ${{ parameters.osGroup }}
     osSubgroup: ${{ parameters.osSubgroup }}
     helixType: 'build/product/'
     enableMicrobuild: true
-    stagedBuild: ${{ parameters.stagedBuild }}
     pool: ${{ parameters.pool }}
     condition: ${{ parameters.condition }}
 

diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml
@@ -7,7 +7,6 @@ parameters:
   helixType: '(unspecified)'
   container: ''
   crossrootfsDir: ''
-  stagedBuild: false
   strategy: ''
   pool: ''
 
@@ -31,8 +30,7 @@ jobs:
     container: ${{ parameters.container }}
     condition: ${{ parameters.condition }}
     dependsOn:
-      - ${{ if ne(parameters.stagedBuild, true) }}:
-        - checkout
+      - checkout
       - ${{ if ne(parameters.dependsOn, '') }}:
         - ${{ parameters.dependsOn }}
 

diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
@@ -7,7 +7,6 @@ parameters:
   helixType: '(unspecified)'
   container: ''
   liveLibrariesBuildConfig: ''
-  stagedBuild: false
   strategy: ''
   pool: ''
 
@@ -32,7 +31,6 @@ jobs:
     name: ${{ parameters.name }}
     helixType: ${{ parameters.helixType }}
     container: ${{ parameters.container }}
-    stagedBuild: ${{ parameters.stagedBuild }}
     strategy: ${{ parameters.strategy }}
     pool: ${{ parameters.pool }}
 

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -198,7 +198,7 @@ jobs:
 
 #
 # Build Mono debug
-# Only when Mono is changed
+# Only when libraries or mono changed
 #
 - template: /eng/pipelines/common/platform-matrix.yml
   parameters:
@@ -219,11 +219,13 @@ jobs:
     jobParameters:
       condition: >-
         or(
+          eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
           eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
           eq(variables['isFullMatrix'], true))
 
 #
 # Build Mono release
+# Only when libraries or mono changed
 #
 - template: /eng/pipelines/common/platform-matrix.yml
   parameters:
@@ -241,6 +243,12 @@ jobs:
     # - Windows_NT_x86
     # - Windows_NT_arm
     # - Windows_NT_arm64
+    jobParameters:
+      condition: >-
+        or(
+          eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
+          eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
+          eq(variables['isFullMatrix'], true))
 
 #
 # Build libraries using live CoreLib
@@ -485,6 +493,7 @@ jobs:
 
 #
 # Libraries Release Test Execution against a release mono runtime.
+# Only when libraries or mono changed
 #
 - template: /eng/pipelines/common/platform-matrix.yml
   parameters:
@@ -504,6 +513,11 @@ jobs:
       liveRuntimeBuildConfig: release
       dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
       dependsOnTestArchitecture: x64
+      condition: >-
+        or(
+          eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
+          eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
+          eq(variables['isFullMatrix'], true))
 
 #
 # Libraries Release Test Execution against a release coreclr runtime