Skip to content
Merged
2 changes: 1 addition & 1 deletion eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-sdk-template</artifactId>
<version>1.0.4-beta.13</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
<version>1.0.4-beta.15</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
</dependency>
</dependencies>

Expand Down
62 changes: 47 additions & 15 deletions eng/pipelines/templates/stages/archetype-java-release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
parameters:
Artifacts: []
ArtifactName: 'not-specified'
TargetDocRepoOwner: ''
TargetDocRepoName: ''

stages:
# The signing stage is responsible for submitting binaries to ESRP for our official signing
Expand Down Expand Up @@ -85,14 +87,11 @@ stages:
deploy:
steps:
- checkout: self
- pwsh: |
Get-ChildItem $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
New-Item -Type Directory -Name ${{artifact.safeName}} -Path $(Pipeline.Workspace)
Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed/${{artifact.name}}-[0-9]*.[0-9]*.[0-9]* $(Pipeline.Workspace)/${{artifact.safeName}}
Get-ChildItem $(Pipeline.Workspace)/${{artifact.safeName}}
workingDirectory: $(Pipeline.Workspace)
displayName: Stage artifacts
timeoutInMinutes: 5
- template: /eng/pipelines/templates/steps/stage-artifacts.yml
parameters:
SourceFolder: ${{parameters.ArtifactName}}-signed
TargetFolder: ${{artifact.safeName}}
PackageName: ${{artifact.name}}
- template: /eng/common/pipelines/templates/steps/create-tags-and-git-release.yml
parameters:
ArtifactLocation: $(Pipeline.Workspace)/${{artifact.safeName}}
Expand Down Expand Up @@ -139,14 +138,48 @@ stages:
BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools
JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java

- ${{if ne(artifact.options.skipPublishDocs, 'true')}}:
- deployment: PublicDocsMs
displayName: "Publish Updates for Docs.MS"
condition: and(succeeded(), ne(variables['Skip.PublishDocs'], 'true'))
environment: github
timeoutInMinutes: 5
dependsOn: PublishPackage

pool:
vmImage: vs2017-win2016

strategy:
runOnce:
deploy:
steps:
- checkout: self
- template: /eng/pipelines/templates/steps/stage-artifacts.yml
parameters:
SourceFolder: ${{parameters.ArtifactName}}-signed
TargetFolder: ${{artifact.safeName}}
PackageName: ${{artifact.name}}
- template: /eng/common/pipelines/templates/steps/docs-metadata-release.yml
parameters:
ArtifactLocation: $(Pipeline.Workspace)/${{artifact.safeName}}
PackageRepository: Maven
ReleaseSha: $(Build.SourceVersion)
RepoId: Azure/azure-sdk-for-java
WorkingDirectory: $(System.DefaultWorkingDirectory)
TargetDocRepoOwner: ${{parameters.TargetDocRepoOwner}}
TargetDocRepoName: ${{parameters.TargetDocRepoName}}
PRBranchName: 'smoke-test-rdme'
ArtifactName: ${{parameters.ArtifactName}}
Language: 'java'
DocRepoDestinationPath: 'docs-ref-services/'

- ${{if ne(artifact.options.skipPublishDocs, 'true')}}:
- deployment: PublishDocs
displayName: Publish Docs to GitHubIO Blob Storage
condition: and(succeeded(), ne(variables['Skip.PublishDocs'], 'true'))
environment: githubio
dependsOn: PublishPackage


pool:
vmImage: windows-2019

Expand All @@ -155,12 +188,11 @@ stages:
deploy:
steps:
- checkout: self
- pwsh: |
Get-ChildItem -Recurse $(Pipeline.Workspace)
New-Item -Type Directory -Name ${{artifact.safeName}} -Path $(Pipeline.Workspace)
Copy-Item $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}-[0-9]*.[0-9]*.[0-9]* $(Pipeline.Workspace)/${{artifact.safeName}}
workingDirectory: $(Pipeline.Workspace)
displayName: Stage artifacts
- template: /eng/pipelines/templates/steps/stage-artifacts.yml
parameters:
SourceFolder: ${{parameters.ArtifactName}}-signed
TargetFolder: ${{artifact.safeName}}
PackageName: ${{artifact.name}}
- pwsh: |
Get-ChildItem -Recurse $(Pipeline.Workspace)/${{artifact.safeName}}
workingDirectory: $(Pipeline.Workspace)
Expand Down
6 changes: 6 additions & 0 deletions eng/pipelines/templates/stages/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ parameters:
AdditionalModules: []
SDKType: client
ServiceDirectory: not-specified
TargetDocRepoOwner: 'Azure'
TargetDocRepoName: 'azure-docs-sdk-java'


stages:
- stage: Build
Expand All @@ -23,3 +26,6 @@ stages:
SDKType: ${{parameters.SDKType}}
Artifacts: ${{parameters.Artifacts}}
ArtifactName: packages
TargetDocRepoOwner: ${{parameters.TargetDocRepoOwner}}
TargetDocRepoName: ${{parameters.TargetDocRepoName}}

10 changes: 10 additions & 0 deletions eng/pipelines/templates/steps/stage-artifacts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
parameters:
SourceFolder: '' # ArtifactName (aka "packages")
TargetFolder: '' # artifact.safename (azuretemplate)
PackageName: '' # artifact.name (azure-template)

steps:
- pwsh: |
New-Item -Force -Type Directory -Name ${{parameters.TargetFolder}} -Path $(Pipeline.Workspace)
Copy-Item $(Pipeline.Workspace)/${{parameters.SourceFolder}}/${{parameters.PackageName}}-[0-9]*.[0-9]*.[0-9]* $(Pipeline.Workspace)/${{parameters.TargetFolder}}
displayName: Stage artifacts
2 changes: 1 addition & 1 deletion eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ com.azure:azure-search-documents;1.0.0-beta.3;1.0.0-beta.4
com.azure:azure-security-keyvault-certificates;4.1.0-beta.2;4.1.0-beta.3
com.azure:azure-security-keyvault-keys;4.2.0-beta.3;4.2.0-beta.4
com.azure:azure-security-keyvault-secrets;4.2.0-beta.2;4.2.0-beta.3
com.azure:azure-sdk-template;1.0.4-beta.12;1.0.4-beta.13
com.azure:azure-sdk-template;1.0.4-beta.14;1.0.4-beta.15
com.azure:azure-storage-blob;12.6.1;12.7.0-beta.1
com.azure:azure-storage-blob-batch;12.5.1;12.6.0-beta.1
com.azure:azure-storage-blob-cryptography;12.6.1;12.7.0-beta.1
Expand Down
6 changes: 6 additions & 0 deletions sdk/template/azure-sdk-template/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release History

## 1.0.4-beta.15 (Unreleased)
- Test Java Release Pipeline

## 1.0.4-beta.14 (2020-05-18)
- Test Java Release Pipeline

## 1.0.4-beta.13 (2020-04-14)
- Test Java Release Pipeline

Expand Down
2 changes: 1 addition & 1 deletion sdk/template/azure-sdk-template/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-sdk-template</artifactId>
<version>1.0.4-beta.13</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
<version>1.0.4-beta.15</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->

<name>Microsoft Azure SDK for Template</name>
<description>This package contains Microsoft Azure SDK for Template.</description>
Expand Down