Skip to content

Commit

Permalink
Call eng/common/scripts/SetTestPipelineVersion.ps1 (Azure#14138)
Browse files Browse the repository at this point in the history
* Call eng/common/scripts/SetTestPipelineVersion.ps1

* call set-test-pipeline-version.yml instead

* Remove unreleased entries from CHANGELOG.md

* Remove unreleased entries from CHANGELOG.md

* Add set-test-pipeine-version.yml to analyze stage
  • Loading branch information
chidozieononiwu authored Mar 16, 2021
1 parent f9de872 commit 84a7f56
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 63 deletions.
1 change: 1 addition & 0 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ jobs:
parameters:
Artifacts: ${{ parameters.Artifacts }}
ServiceDirectory: ${{ parameters.ServiceDirectory }}
TestPipeline: ${{ parameters.TestPipeline }}

# Only run tests if the matrix has entries
- ${{ if ne(parameters.RunUnitTests, false) }}:
Expand Down
14 changes: 5 additions & 9 deletions eng/pipelines/templates/stages/archetype-js-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,11 @@ stages:
deploy:
steps:
- checkout: self
- ${{if eq(parameters.TestPipeline, 'true')}}:
- task: PowerShell@2
displayName: Prep template pipeline for release
condition: succeeded()
inputs:
pwsh: true
workingDirectory: $(Build.SourcesDirectory)
filePath: eng/scripts/SetTestPipelineVersion.ps1
arguments: '-BuildID $(Build.BuildId)'
- template: /eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
parameters:
PackageName: "@azure/template"
ServiceDirectory: "template"
TestPipeline: ${{ parameters.TestPipeline }}
- template: /eng/common/pipelines/templates/steps/verify-changelog.yml
parameters:
PackageName: ${{artifact.name}}
Expand Down
7 changes: 7 additions & 0 deletions eng/pipelines/templates/steps/analyze.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
parameters:
Artifacts: []
ServiceDirectory: not-specified
TestPipeline: false

steps:
- template: /eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
parameters:
PackageName: "@azure/template"
ServiceDirectory: "template"
TestPipeline: ${{ parameters.TestPipeline }}

- task: PublishPipelineArtifact@1
condition: succeededOrFailed()
displayName: "Publish Report Artifacts"
Expand Down
14 changes: 5 additions & 9 deletions eng/pipelines/templates/steps/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@ parameters:
ServiceDirectory: not-specified

steps:
- ${{if eq(parameters.TestPipeline, 'true')}}:
- task: PowerShell@2
displayName: Prep template pipeline for release
condition: succeeded()
inputs:
pwsh: true
workingDirectory: $(Build.SourcesDirectory)
filePath: eng/scripts/SetTestPipelineVersion.ps1
arguments: '-BuildID $(Build.BuildId)'
- template: /eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
parameters:
PackageName: "@azure/template"
ServiceDirectory: "template"
TestPipeline: ${{ parameters.TestPipeline }}

- pwsh: |
$folder = "${{parameters.ServiceDirectory}}"
Expand Down
39 changes: 0 additions & 39 deletions eng/scripts/SetTestPipelineVersion.ps1

This file was deleted.

6 changes: 0 additions & 6 deletions sdk/template/template/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# Release History

## 1.0.11-beta.1 (Unreleased)

- Restructured the template package to use the Client SDK developer training materials.

## 1.0.10-beta.1 (2020-11-16)

- Test Release Pipeline
Expand All @@ -24,8 +20,6 @@

- Testing prerelease versioning changes

## 1.0.8 (Unreleased)

## 1.0.7 (2020-04-01)

## 1.0.6 (2020-03-26)
Expand Down

0 comments on commit 84a7f56

Please sign in to comment.