Skip to content

Commit 38839b7

Browse files
authored
Fix skipPublishDocGithubIo variable (#36926)
* Fix skipPublishDocGithubIo variable * fix bad spacing that somehow worked when it was in an if statement * revert the change to template's yml used to test the fix
1 parent ddaa0ae commit 38839b7

File tree

2 files changed

+37
-36
lines changed

2 files changed

+37
-36
lines changed

eng/pipelines/templates/stages/archetype-python-release.yml

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ stages:
176176
ArtifactName: ${{parameters.ArtifactName}}
177177
PackageName: ${{artifact.name}}
178178

179-
- ${{if ne(artifact.skipPublishDocs, 'true')}}:
179+
- ${{if ne(artifact.skipPublishDocGithubIo, 'true')}}:
180180
- deployment: PublishGitHubIODocs
181181
displayName: Publish Docs to GitHubIO Blob Storage
182182
condition: and(succeeded(), ne(variables['Skip.PublishDocs'], 'true'))
@@ -243,43 +243,44 @@ stages:
243243
- metadata/
244244
PackageSourceOverride: ${{parameters.PackageSourceOverride}}
245245
DocValidationImageId: ${{parameters.DocValidationImageId}}
246-
- ${{if ne(artifact.skipPublishDocGithubIo, 'true')}}:
247-
- deployment: UpdatePackageVersion
248-
displayName: "Update Package Version"
249-
condition: and(succeeded(), ne(variables['Skip.UpdatePackageVersion'], 'true'))
250-
environment: github
251-
dependsOn: PublishPackage
252246

253-
pool:
254-
image: azsdk-pool-mms-ubuntu-2004-1espt
255-
name: azsdk-pool-mms-ubuntu-2004-general
256-
os: linux
247+
- deployment: UpdatePackageVersion
248+
displayName: "Update Package Version"
249+
condition: and(succeeded(), ne(variables['Skip.UpdatePackageVersion'], 'true'))
250+
environment: github
251+
dependsOn: PublishPackage
257252

258-
strategy:
259-
runOnce:
260-
deploy:
261-
steps:
262-
- checkout: self
263-
- task: UsePythonVersion@0
264-
- script: |
265-
python -m pip install "./tools/azure-sdk-tools[build]"
266-
displayName: Install versioning tool dependencies
253+
pool:
254+
image: azsdk-pool-mms-ubuntu-2004-1espt
255+
name: azsdk-pool-mms-ubuntu-2004-general
256+
os: linux
257+
258+
strategy:
259+
runOnce:
260+
deploy:
261+
steps:
262+
- checkout: self
263+
- task: UsePythonVersion@0
264+
- script: |
265+
python -m pip install "./tools/azure-sdk-tools[build]"
266+
displayName: Install versioning tool dependencies
267+
268+
- pwsh: |
269+
sdk_increment_version --package-name ${{ artifact.name }} --service ${{ parameters.ServiceDirectory }}
270+
if (Test-Path component-detection-pip-report.json) {
271+
Write-Host "Deleting component-detection-pip-report.json"
272+
rm component-detection-pip-report.json
273+
}
274+
displayName: Increment package version
275+
276+
- template: /eng/common/pipelines/templates/steps/create-pull-request.yml
277+
parameters:
278+
RepoName: azure-sdk-for-python
279+
PRBranchName: increment-package-version-${{ parameters.ServiceDirectory }}-$(Build.BuildId)
280+
CommitMsg: "Increment package version after release of ${{ artifact.name }}"
281+
PRTitle: "Increment version for ${{ parameters.ServiceDirectory }} releases"
282+
CloseAfterOpenForTesting: '${{ parameters.TestPipeline }}'
267283

268-
- pwsh: |
269-
sdk_increment_version --package-name ${{ artifact.name }} --service ${{ parameters.ServiceDirectory }}
270-
if (Test-Path component-detection-pip-report.json) {
271-
Write-Host "Deleting component-detection-pip-report.json"
272-
rm component-detection-pip-report.json
273-
}
274-
displayName: Increment package version
275-
276-
- template: /eng/common/pipelines/templates/steps/create-pull-request.yml
277-
parameters:
278-
RepoName: azure-sdk-for-python
279-
PRBranchName: increment-package-version-${{ parameters.ServiceDirectory }}-$(Build.BuildId)
280-
CommitMsg: "Increment package version after release of ${{ artifact.name }}"
281-
PRTitle: "Increment version for ${{ parameters.ServiceDirectory }} releases"
282-
CloseAfterOpenForTesting: '${{ parameters.TestPipeline }}'
283284
- ${{if and(eq(variables['Build.Reason'], 'Manual'), eq(variables['System.TeamProject'], 'internal'))}}:
284285
- template: /eng/pipelines/templates/jobs/smoke.tests.yml
285286
parameters:

sdk/storage/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ extends:
5050
- name: azure-storage-extensions
5151
safeName: azurestorageextensions
5252
# Pure C-based storage extension package, not generating docs at this moment.
53-
skipPublishDocs: true
53+
skipPublishDocGithubIo: true
5454
skipPublishDocMs: true
5555
- name: azure-mgmt-storage
5656
safeName: azuremgmtstorage

0 commit comments

Comments
 (0)