Skip to content

Commit c2d0fb6

Browse files
committed
Move RequireDependencies into pack.yml
1 parent 00b36f6 commit c2d0fb6

File tree

2 files changed

+26
-13
lines changed

2 files changed

+26
-13
lines changed

eng/pipelines/templates/jobs/ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ parameters:
33
type: string
44
- name: Artifacts
55
type: object
6-
- name: RequireDependencies
7-
type: boolean
86
- name: PipelineArtifactName
97
type: string
108
- name: TestPipeline
@@ -26,7 +24,6 @@ jobs:
2624
parameters:
2725
ServiceDirectory: ${{ parameters.ServiceDirectory }}
2826
Artifacts: ${{ parameters.Artifacts }}
29-
RequireDependencies: ${{ parameters.RequireDependencies }}
3027
TestPipeline: ${{ parameters.TestPipeline }}
3128
PipelineArtifactName: ${{ parameters.PipelineArtifactName }}
3229

eng/pipelines/templates/jobs/pack.yml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ jobs:
2020
image: $(LINUXVMIMAGE)
2121
os: linux
2222

23+
variables:
24+
# Only require dependency correctness in manual builds
25+
- RequireDependencies: ${{ in(variables['Build.Reason'], 'Manual', '') }}
26+
2327
steps:
2428
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
2529
parameters:
@@ -57,16 +61,28 @@ jobs:
5761
ServiceDirectory: ${{ parameters.ServiceDirectory }}
5862
PackageInfoDirectory: $(Build.ArtifactStagingDirectory)/PackageInfo
5963

60-
- task: Powershell@2
61-
displayName: "Pack Crates"
62-
condition: and(succeeded(), ne(variables['NoPackagesChanged'],'true'))
63-
inputs:
64-
pwsh: true
65-
filePath: $(Build.SourcesDirectory)/eng/scripts/Pack-Crates.ps1
66-
arguments: >
67-
-OutputPath '$(Build.ArtifactStagingDirectory)'
68-
-PackageNames ${{ join(',', parameters.Artifacts.*.name) }}
69-
-RequireDependencies:$${{ parameters.RequireDependencies }}
64+
- ${{ if eq('auto', parameters.ServiceDirectory) }}:
65+
- task: Powershell@2
66+
displayName: "Pack Crates (PR build)"
67+
condition: and(succeeded(), ne(variables['NoPackagesChanged'],'true'))
68+
inputs:
69+
pwsh: true
70+
filePath: $(Build.SourcesDirectory)/eng/scripts/Pack-Crates.ps1
71+
arguments: >
72+
-OutputPath '$(Build.ArtifactStagingDirectory)'
73+
-PackageInfoDirectory '$(Build.ArtifactStagingDirectory)/PackageInfo'
74+
75+
- ${{ else }}:
76+
- task: Powershell@2
77+
displayName: "Pack Crates"
78+
condition: and(succeeded(), ne(variables['NoPackagesChanged'],'true'))
79+
inputs:
80+
pwsh: true
81+
filePath: $(Build.SourcesDirectory)/eng/scripts/Pack-Crates.ps1
82+
arguments: >
83+
-OutputPath '$(Build.ArtifactStagingDirectory)'
84+
-PackageNames ${{ join(',', parameters.Artifacts.*.name) }}
85+
-RequireDependencies:$$(RequireDependencies)
7086
7187
# TODO: Ensure APIView works given a change to the crates output folder structure
7288
- template: /eng/common/pipelines/templates/steps/publish-1es-artifact.yml

0 commit comments

Comments
 (0)