Skip to content

Commit

Permalink
Update yml paths and add exclude filter (#13)
Browse files Browse the repository at this point in the history
* Update yml paths and add exclude filter

* Downgrade CoreCLR version and update SDK.IL

* Update sendtohelix proj location in yml

* Add missing property for pkg validation
  • Loading branch information
ViktorHofer authored Nov 4, 2019
1 parent a869813 commit 534783a
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 28 deletions.
5 changes: 3 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,15 @@
<MicrosoftDotNetPlatformAbstractionsVersion>3.0.0</MicrosoftDotNetPlatformAbstractionsVersion>
<!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>5.0.0-alpha1.19552.2</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19551.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETSdkILVersion>5.0.0-alpha1.19551.1</MicrosoftNETSdkILVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19525.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETSdkILVersion>5.0.0-alpha1.19552.2</MicrosoftNETSdkILVersion>
<!-- Libraries dependencies -->
<MicrosoftNETCorePlatformsVersion>5.0.0-alpha.1.19551.5</MicrosoftNETCorePlatformsVersion>
<MicrosoftPrivateCoreFxNETCoreAppVersion>5.0.0-alpha.1.19551.5</MicrosoftPrivateCoreFxNETCoreAppVersion>
<MicrosoftNETCoreTargetsVersion>5.0.0-alpha.1.19551.5</MicrosoftNETCoreTargetsVersion>
<SystemTextJsonVersion>5.0.0-alpha.1.19551.5</SystemTextJsonVersion>
<SystemTextEncodingsWebVersion>5.0.0-alpha.1.19551.5</SystemTextEncodingsWebVersion>
<runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19551.5</runtimenativeSystemIOPortsVersion>
<!-- Standard dependencies -->
<NETStandardLibraryVersion>2.2.0-prerelease.19551.1</NETStandardLibraryVersion>
<!-- dotnet-optimization dependencies -->
Expand Down
20 changes: 11 additions & 9 deletions eng/pipelines/libraries/.azure-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,35 @@ trigger:
branches:
include:
- master
- release/3.*
paths:
exclude:
- Documentation/*
- docs/*
- CODE-OF-CONDUCT.md
- CONTRIBUTING.md
- LICENSE.TXT
- PATENTS.TXT
- README.md
- SECURITY.md
- THIRD-PARTY-NOTICES.TXT
- src/installer/*
- src/coreclr/*

pr:
branches:
include:
- master
- release/3.*
paths:
exclude:
- Documentation/*
- docs/*
- CODE-OF-CONDUCT.md
- CONTRIBUTING.md
- LICENSE.TXT
- PATENTS.TXT
- README.md
- SECURITY.md
- THIRD-PARTY-NOTICES.TXT
- src/installer/*
- src/coreclr/*

resources:
containers:
Expand Down Expand Up @@ -73,32 +75,32 @@ variables:

stages:
# Windows legs
- template: /eng/pipelines/windows.yml
- template: /eng/pipelines/libraries/windows.yml
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

# Linux legs
- template: /eng/pipelines/linux.yml
- template: /eng/pipelines/libraries/linux.yml
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

# MacOS legs
- template: /eng/pipelines/macos.yml
- template: /eng/pipelines/libraries/macos.yml
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

# FreeBSD leg is only for official builds
# - template: /eng/pipelines/freebsd.yml
# - template: /eng/pipelines/libraries/freebsd.yml
# parameters:
# isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
# fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

# Publish and validation steps. Only run in official builds
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/pipelines/pre-publish.yml
- template: /eng/pipelines/libraries/pre-publish.yml
parameters:
dependsOn:
- WindowsStage
Expand Down
12 changes: 6 additions & 6 deletions eng/pipelines/libraries/corefx-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ parameters:
# Required: submitToHelix -> Boolean -> Value to know if it should submit tests payloads to helix.

# Optional: buildScriptPrefix -> String -> string to append to Unix build script.
# buildScriptPrefix: 'HOME=/home/ ' -> 'HOME=/home/ ./build.sh ...'
# buildScriptPrefix: 'HOME=/home/ ' -> 'HOME=/home/ ./libraries.sh ...'

# Optional: buildExtraArguments -> String -> string to append at the end of the build arguments
# buildExtraArguments: /p:RuntimeOS=win10 -> 'build.cmd ... /p:RuntimeOS=win10'
# buildExtraArguments: /p:RuntimeOS=win10 -> 'libraries.cmd ... /p:RuntimeOS=win10'

# Optional: customBuildSteps -> Array -> list of steps to run instead of the common build steps.
# customBuildSteps:
Expand All @@ -52,7 +52,7 @@ parameters:

jobs:
- ${{ each job in parameters.jobs }}:
- template: ../common/templates/job/job.yml
- template: /eng/common/templates/job/job.yml
parameters:
variables:

Expand Down Expand Up @@ -96,12 +96,12 @@ jobs:

# Windows variables
- ${{ if eq(parameters.targetOS, 'Windows_NT') }}:
- _buildScript: build.cmd
- _buildScript: libraries.cmd
- _msbuildCommand: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 -warnaserror:0 -ci

# Non-Windows variables
- ${{ if ne(parameters.targetOS, 'Windows_NT') }}:
- _buildScript: ${{ job.buildScriptPrefix }}./build.sh
- _buildScript: ${{ job.buildScriptPrefix }}./libraries.sh
- _msbuildCommand: ${{ job.buildScriptPrefix }}./eng/common/msbuild.sh --warnaserror false --ci
- ${{ if eq(parameters.isOfficialBuild, 'true') }}:
- _commonArguments: $(_args) -stripSymbols
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
artifactType: container
condition: and(succeeded(), eq(variables['_publishTests'], 'true'))

- template: /eng/pipelines/helix.yml
- template: /eng/pipelines/libraries/helix.yml
parameters:
# send tests to helix only on public builds, official scheduled builds or manual official builds.
condition: eq(${{ parameters.isOfficialBuild }}, False)
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/helix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:

steps:
- script: ${{ parameters.msbuildScript }}
src/sendtohelix.proj
src/libraries/sendtohelix.proj
/t:test
/p:ArchGroup=${{ parameters.archGroup }}
/p:ConfigurationGroup=${{ parameters.configuration }}
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/libraries/outerloop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,23 @@ resources:
stages:
# Windows outerloop legs
- ${{ if or(endsWith(variables['Build.DefinitionName'], 'windows'), endsWith(variables['Build.DefinitionName'], 'outerloop')) }}:
- template: /eng/pipelines/windows.yml
- template: /eng/pipelines/libraries/windows.yml
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
testScope: outerloop

# Linux outerloop legs
- ${{ if or(endsWith(variables['Build.DefinitionName'], 'linux'), endsWith(variables['Build.DefinitionName'], 'outerloop')) }}:
- template: /eng/pipelines/linux.yml
- template: /eng/pipelines/libraries/linux.yml
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
testScope: outerloop

# MacOS outerloop legs
- ${{ if or(endsWith(variables['Build.DefinitionName'], 'osx'), endsWith(variables['Build.DefinitionName'], 'outerloop')) }}:
- template: /eng/pipelines/macos.yml
- template: /eng/pipelines/libraries/macos.yml
parameters:
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
Expand Down
10 changes: 5 additions & 5 deletions eng/pipelines/libraries/pre-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stages:
displayName: Pre-publish
dependsOn: ${{ parameters.dependsOn }}
jobs:
- template: ../common/templates/jobs/jobs.yml
- template: /eng/common/templates/jobs/jobs.yml
parameters:
enableMicrobuild: true
enablePublishUsingPipelines: $(_PublishUsingPipelines)
Expand Down Expand Up @@ -51,20 +51,20 @@ stages:
artifactName: packages
downloadPath: $(_artifactsDir)

- script: build.cmd
- script: libraries.cmd
-restore
-ci
displayName: Restore tools

- script: build.cmd
- script: libraries.cmd
-sign
-ci
-configuration $(_BuildConfig)
/p:DotNetSignType=$(_SignType)
/p:OfficialBuildId=$(Build.BuildNumber)
displayName: Sign packages

- script: build.cmd
- script: libraries.cmd
-publish
-ci
-configuration $(_BuildConfig)
Expand All @@ -77,7 +77,7 @@ stages:
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/PublishToArtifacts.binlog
displayName: Publish to artifacts and produce manifest

- script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 src\build.proj
- script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 src\libraries\build.proj
-warnaserror:0 -ci
/t:UpdatePublishedVersions
/p:GitHubAuthToken=$(AccessToken-dotnet-build-bot-public-repo)
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/stress/http-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ steps:
lfs: false

- powershell: |
.\build.cmd -ci -c $(BUILD_CONFIGURATION)
.\libraries.cmd -ci -c $(BUILD_CONFIGURATION)
displayName: Build Corefx

- powershell: |
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ stages:

frameworkArg: -allConfigurations
customBuildSteps:
- script: build.cmd
- script: libraries.cmd
-build
-configuration $(_BuildConfig)
-ci
Expand Down

0 comments on commit 534783a

Please sign in to comment.