From 4503ca3baeeedd163d7c11fc3bc3396ee79eb7bc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 22 Jan 2020 21:30:32 +0100 Subject: [PATCH 1/2] Address follow-up feedback from #1934 --- eng/pipelines/common/platform-matrix.yml | 2 +- eng/pipelines/common/xplat-setup.yml | 11 +++++------ eng/pipelines/libraries/build-job.yml | 2 +- eng/pipelines/mono/templates/build-job.yml | 3 --- eng/pipelines/mono/templates/xplat-job.yml | 4 +--- .../mono/templates/xplat-pipeline-job.yml | 2 -- eng/pipelines/runtime.yml | 18 ++++++++++++++++-- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 46eef081e0b2c8..dcaaf8aa174441 100644 --- 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 index 57cde8c86fff17..f1be98fb36e7d9 100644 --- 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 index 0e3e3b8cfb3985..5eaa157210a3fd 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -81,7 +81,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 index 903fc2305ccb52..0cab85160467a8 100644 --- 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 index 4ff08333450290..8d7465d7f88453 100644 --- 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 index 51190c2bc34622..954cbdb20889d0 100644 --- 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 index 63de290cd320cb..0aef69d0537203 100644 --- 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: @@ -217,13 +217,15 @@ jobs: # - Windows_NT_arm # - Windows_NT_arm64 jobParameters: - condition: >- + 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 From ba3f1f8053544f061482ac056d9bac6ad6940797 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 22 Jan 2020 21:45:59 +0100 Subject: [PATCH 2/2] Remove whitespaces --- eng/pipelines/runtime.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 0aef69d0537203..885bf7ecfdce11 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -217,7 +217,7 @@ jobs: # - Windows_NT_arm # - Windows_NT_arm64 jobParameters: - condition: >- + condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), @@ -244,7 +244,7 @@ jobs: # - Windows_NT_arm # - Windows_NT_arm64 jobParameters: - condition: >- + condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), @@ -513,7 +513,7 @@ jobs: liveRuntimeBuildConfig: release dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} dependsOnTestArchitecture: x64 - condition: >- + condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),