Skip to content

Commit 84d4bda

Browse files
committed
Update yml paths and add exclude filter
1 parent a869813 commit 84d4bda

File tree

6 files changed

+27
-25
lines changed

6 files changed

+27
-25
lines changed

eng/pipelines/libraries/.azure-ci.yml

+11-9
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,35 @@ trigger:
77
branches:
88
include:
99
- master
10-
- release/3.*
1110
paths:
1211
exclude:
13-
- Documentation/*
12+
- docs/*
1413
- CODE-OF-CONDUCT.md
1514
- CONTRIBUTING.md
1615
- LICENSE.TXT
1716
- PATENTS.TXT
1817
- README.md
1918
- SECURITY.md
2019
- THIRD-PARTY-NOTICES.TXT
20+
- src/installer/*
21+
- src/coreclr/*
2122

2223
pr:
2324
branches:
2425
include:
2526
- master
26-
- release/3.*
2727
paths:
2828
exclude:
29-
- Documentation/*
29+
- docs/*
3030
- CODE-OF-CONDUCT.md
3131
- CONTRIBUTING.md
3232
- LICENSE.TXT
3333
- PATENTS.TXT
3434
- README.md
3535
- SECURITY.md
3636
- THIRD-PARTY-NOTICES.TXT
37+
- src/installer/*
38+
- src/coreclr/*
3739

3840
resources:
3941
containers:
@@ -73,32 +75,32 @@ variables:
7375

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

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

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

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

99101
# Publish and validation steps. Only run in official builds
100102
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}:
101-
- template: /eng/pipelines/pre-publish.yml
103+
- template: /eng/pipelines/libraries/pre-publish.yml
102104
parameters:
103105
dependsOn:
104106
- WindowsStage

eng/pipelines/libraries/corefx-base.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ parameters:
3232
# Required: submitToHelix -> Boolean -> Value to know if it should submit tests payloads to helix.
3333

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

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

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

5353
jobs:
5454
- ${{ each job in parameters.jobs }}:
55-
- template: ../common/templates/job/job.yml
55+
- template: /eng/common/templates/job/job.yml
5656
parameters:
5757
variables:
5858

@@ -96,12 +96,12 @@ jobs:
9696

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

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

189-
- template: /eng/pipelines/helix.yml
189+
- template: /eng/pipelines/libraries/helix.yml
190190
parameters:
191191
# send tests to helix only on public builds, official scheduled builds or manual official builds.
192192
condition: eq(${{ parameters.isOfficialBuild }}, False)

eng/pipelines/libraries/outerloop.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ resources:
3131
stages:
3232
# Windows outerloop legs
3333
- ${{ if or(endsWith(variables['Build.DefinitionName'], 'windows'), endsWith(variables['Build.DefinitionName'], 'outerloop')) }}:
34-
- template: /eng/pipelines/windows.yml
34+
- template: /eng/pipelines/libraries/windows.yml
3535
parameters:
3636
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
3737
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}
3838
testScope: outerloop
3939

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

4848
# MacOS outerloop legs
4949
- ${{ if or(endsWith(variables['Build.DefinitionName'], 'osx'), endsWith(variables['Build.DefinitionName'], 'outerloop')) }}:
50-
- template: /eng/pipelines/macos.yml
50+
- template: /eng/pipelines/libraries/macos.yml
5151
parameters:
5252
isOfficialBuild: ${{ and(ne(variables['System.TeamProject'], 'public'), notIn(variables['Build.Reason'], 'PullRequest')) }}
5353
fullMatrix: ${{ notIn(variables['Build.Reason'], 'PullRequest') }}

eng/pipelines/libraries/pre-publish.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ stages:
77
displayName: Pre-publish
88
dependsOn: ${{ parameters.dependsOn }}
99
jobs:
10-
- template: ../common/templates/jobs/jobs.yml
10+
- template: /eng/common/templates/jobs/jobs.yml
1111
parameters:
1212
enableMicrobuild: true
1313
enablePublishUsingPipelines: $(_PublishUsingPipelines)
@@ -51,20 +51,20 @@ stages:
5151
artifactName: packages
5252
downloadPath: $(_artifactsDir)
5353

54-
- script: build.cmd
54+
- script: libraries.cmd
5555
-restore
5656
-ci
5757
displayName: Restore tools
5858

59-
- script: build.cmd
59+
- script: libraries.cmd
6060
-sign
6161
-ci
6262
-configuration $(_BuildConfig)
6363
/p:DotNetSignType=$(_SignType)
6464
/p:OfficialBuildId=$(Build.BuildNumber)
6565
displayName: Sign packages
6666

67-
- script: build.cmd
67+
- script: libraries.cmd
6868
-publish
6969
-ci
7070
-configuration $(_BuildConfig)
@@ -77,7 +77,7 @@ stages:
7777
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/PublishToArtifacts.binlog
7878
displayName: Publish to artifacts and produce manifest
7979

80-
- script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 src\build.proj
80+
- script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 src\libraries\build.proj
8181
-warnaserror:0 -ci
8282
/t:UpdatePublishedVersions
8383
/p:GitHubAuthToken=$(AccessToken-dotnet-build-bot-public-repo)

eng/pipelines/libraries/stress/http-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
lfs: false
1414

1515
- powershell: |
16-
.\build.cmd -ci -c $(BUILD_CONFIGURATION)
16+
.\libraries.cmd -ci -c $(BUILD_CONFIGURATION)
1717
displayName: Build Corefx
1818

1919
- powershell: |

eng/pipelines/libraries/windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ stages:
126126

127127
frameworkArg: -allConfigurations
128128
customBuildSteps:
129-
- script: build.cmd
129+
- script: libraries.cmd
130130
-build
131131
-configuration $(_BuildConfig)
132132
-ci

0 commit comments

Comments
 (0)