diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index 429a1a2566d8b..91f7c285c6792 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -24,7 +24,7 @@ parameters: steps: - template: /eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml parameters: - osGroup: ${{ variables['Agent.Os'] }} + osGroup: variables['Agent.Os'] sendParams: $(Build.SourcesDirectory)/eng/common/performance/${{ parameters.ProjectFile }} /restore /t:Test /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog displayName: ${{ parameters.DisplayNamePrefix }} condition: ${{ parameters.condition }} diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml index 647778511370b..4581413b024e0 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml @@ -7,28 +7,26 @@ parameters: environment: {} steps: -- ${{ if eq(parameters.osGroup, 'Windows_NT') }}: # TODO: Remove and consolidate this when we move to arcade via init-tools.cmd. - powershell: $(Build.SourcesDirectory)\eng\common\build.ps1 -ci ${{ parameters.restoreParams }} displayName: Restore blob feed tasks (Windows) - condition: ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }} + condition: and(and(ne(${{ parameters.condition }}, false), ne(${{ parameters.restoreParams }}, '')), eq(${{ parameters.osGroup }}, 'Windows_NT')) - powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 -ci ${{ parameters.sendParams }} displayName: ${{ parameters.displayName }} (Windows) - condition: ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }} + condition: and(and(ne(${{ parameters.condition }}, false), ne(${{ parameters.sendParams }}, '')), eq(${{ parameters.osGroup }}, 'Windows_NT')) env: ${{ parameters.environment }} -- ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - # TODO: Remove and consolidate this when we move to arcade via init-tools.sh. - - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci ${{ parameters.restoreParams }} - displayName: Restore blob feed tasks (Unix) - condition: ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }} - ${{ if eq(parameters.osGroup, 'FreeBSD') }}: - env: - # Arcade uses this SDK instead of trying to restore one. - DotNetCoreSdkDir: /usr/local/dotnet + # # TODO: Remove and consolidate this when we move to arcade via init-tools.sh. + # - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci ${{ parameters.restoreParams }} + # displayName: Restore blob feed tasks (Unix) + # condition: ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }} + # ${{ if eq(parameters.osGroup, 'FreeBSD') }}: + # env: + # # Arcade uses this SDK instead of trying to restore one. + # DotNetCoreSdkDir: /usr/local/dotnet - - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --ci ${{ parameters.sendParams }} - displayName: ${{ parameters.displayName }} (Unix) - condition: ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }} - env: ${{ parameters.environment }} + # - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --ci ${{ parameters.sendParams }} + # displayName: ${{ parameters.displayName }} (Unix) + # condition: ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }} + # env: ${{ parameters.environment }} diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index a3fd8bb532b64..33c4985e4de2f 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -18,7 +18,24 @@ trigger: - SECURITY.md - THIRD-PARTY-NOTICES.TXT -pr: none +pr: + branches: + include: + - master + paths: + include: + - '*' + - src/libraries/System.Private.CoreLib/* + exclude: + - .github/* + - docs/* + - CODE-OF-CONDUCT.md + - CONTRIBUTING.md + - LICENSE.TXT + - PATENTS.TXT + - README.md + - SECURITY.md + - THIRD-PARTY-NOTICES.TXT jobs: #