8000 Merge pull request #3330 from iclanton/split-out-bump-versions · lapolinarweb/rushstack@f60ef4c · GitHub
[go: up one dir, main page]

Skip to content

Commit f60ef4c

Browse files
authored
Merge pull request microsoft#3330 from iclanton/split-out-bump-versions
Bump versions before running publish.
2 parents 8c9e80c + 5e2f2a5 commit f60ef4c

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

common/config/azure-pipelines/npm-publish-rush.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,18 @@ steps:
77
- checkout: self
88
persistCredentials: true
99
- template: templates/build.yaml
10+
- template: templates/bump-versions.yaml
11+
parameters:
12+
VersionPolicyName: noRush
13+
- template: templates/bump-versions.yaml
14+
parameters:
15+
VersionPolicyName: rush
1016
- template: templates/publish.yaml
1117
parameters:
1218
VersionPolicyName: noRush
19+
- script: 'node apps/rush-lib/scripts/plugins-prepublish.js'
20+
displayName: 'Prepublish workaround'
1321
- template: templates/publish.yaml
1422
parameters:
1523
VersionPolicyName: rush
16-
PrePublishSteps:
17-
- script: 'node apps/rush-lib/scripts/plugins-prepublish.js'
18-
displayName: 'Prepublish workaround'
1924
- template: templates/record-published-versions.yaml

common/config/azure-pipelines/npm-publish.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ steps:
77
- checkout: self
88
persistCredentials: true
99
- template: templates/build.yaml
10+
- template: templates/bump-versions.yaml
11+
parameters:
12+
VersionPolicyName: noRush
1013
- template: templates/publish.yaml
1114
parameters:
1215
VersionPolicyName: noRush
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
parameters:
2+
- name: VersionPolicyName
3+
type: string
4+
5+
steps:
6+
- script: 'node common/scripts/install-run-rush.js version --bump --version-policy ${{ parameters.VersionPolicyName }} --target-branch $(Build.SourceBranchName)'
7+
displayName: 'Rush Version (Policy: ${{ parameters.VersionPolicyName }})'

common/config/azure-pipelines/templates/publish.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
parameters:
22
- name: VersionPolicyName
33
type: string
4-
- name: PrePublishSteps
5-
type: stepList
6-
default: []
74

85
steps:
9-
- script: 'node common/scripts/install-run-rush.js version --bump --version-policy ${{ parameters.VersionPolicyName }} --target-branch $(Build.SourceBranchName)'
10-
displayName: 'Rush Version (Policy: ${{ parameters.VersionPolicyName }})'
11-
- ${{ parameters.PrePublishSteps }}
126
- script: 'node common/scripts/install-run-rush.js publish --apply --publish --include-all --target-branch $(Build.SourceBranchName) --add-commit-details --set-access-level public'
137
displayName: 'Rush Publish (Policy: ${{ parameters.VersionPolicyName }})'
148
env:

0 commit comments

Comments
 (0)
0