From a27e04a5f9610fcc512b9afcf22d4c02edd9dbb4 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Thu, 14 May 2020 15:01:54 -0700 Subject: [PATCH 01/11] share artifact staging. add release stage --- .../stages/archetype-java-release.yml | 64 +++++++++++++++---- .../templates/stages/archetype-sdk-client.yml | 6 ++ .../templates/steps/stage-artifacts.yml | 11 ++++ 3 files changed, 68 insertions(+), 13 deletions(-) create mode 100644 eng/pipelines/templates/steps/stage-artifacts.yml diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index 27b631ee72e8..a09b8252a720 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -1,6 +1,8 @@ parameters: Artifacts: [] ArtifactName: 'not-specified' + TargetDocRepoOwner: 'MicrosoftDocs' + TargetDocRepoName: 'azure-docs-sdk-python' stages: # The signing stage is responsible for submitting binaries to ESRP for our official signing @@ -85,14 +87,12 @@ 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) + - template: /eng/pipelines/templates/steps/stage-filtered-artifacts.yml + parameters: + SourceFolder: ${{parameters.ArtifactName}} + TargetFolder: ${{artifact.safeName}} + PackageName: ${{artifact.name}} displayName: Stage artifacts - timeoutInMinutes: 5 - template: /eng/common/pipelines/templates/steps/create-tags-and-git-release.yml parameters: ArtifactLocation: $(Pipeline.Workspace)/${{artifact.safeName}} @@ -100,6 +100,45 @@ stages: ReleaseSha: $(Build.SourceVersion) RepoId: Azure/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: VerifyReleaseVersion + + pool: + vmImage: vs2017-win2016 + + strategy: + runOnce: + deploy: + steps: + - checkout: self + - template: /eng/pipelines/templates/steps/stage-filtered-artifacts.yml + parameters: + SourceFolder: ${{parameters.ArtifactName}} + TargetFolder: ${{artifact.safeName}} + PackageName: ${{artifact.name}} + displayName: Stage artifacts + timeoutInMinutes: 5 + - 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.skipPublishPackage, 'true')}}: - deployment: PublishPackage displayName: "Publish to Maven Central" @@ -146,7 +185,6 @@ stages: environment: githubio dependsOn: PublishPackage - pool: vmImage: windows-2019 @@ -155,11 +193,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) + - template: /eng/pipelines/templates/steps/stage-filtered-artifacts.yml + parameters: + SourceFolder: ${{parameters.ArtifactName}} + TargetFolder: ${{artifact.safeName}} + PackageName: ${{artifact.name}} displayName: Stage artifacts - pwsh: | Get-ChildItem -Recurse $(Pipeline.Workspace)/${{artifact.safeName}} diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index 563e9dd9b8df..eba37d0ffd0d 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -3,6 +3,9 @@ parameters: AdditionalModules: [] SDKType: client ServiceDirectory: not-specified + TargetDocRepoOwner: 'MicrosoftDocs' + TargetDocRepoName: 'azure-docs-sdk-python' + stages: - stage: Build @@ -23,3 +26,6 @@ stages: SDKType: ${{parameters.SDKType}} Artifacts: ${{parameters.Artifacts}} ArtifactName: packages + TargetDocRepoOwner: ${{parameters.TargetDocRepoOwner}} + TargetDocRepoName: ${{parameters.TargetDocRepoName}} + diff --git a/eng/pipelines/templates/steps/stage-artifacts.yml b/eng/pipelines/templates/steps/stage-artifacts.yml new file mode 100644 index 000000000000..962dc888fd2c --- /dev/null +++ b/eng/pipelines/templates/steps/stage-artifacts.yml @@ -0,0 +1,11 @@ +parameters: + SourceFolder: '' # ArtifactName (aka "packages") + TargetFolder: '' # artifact.safename (azuretemplate) + PackageName: '' # artifact.name (azure-template) + +steps: + - pwsh: | + Get-ChildItem -Recurse $(Pipeline.Workspace) + New-Item -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 \ No newline at end of file From fbbad4a8ec28a24a097eb85d5deda314025de7dc Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Thu, 14 May 2020 15:58:32 -0700 Subject: [PATCH 02/11] update default argument --- eng/pipelines/templates/stages/archetype-java-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index a09b8252a720..7fbb5f504a16 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -1,8 +1,8 @@ parameters: Artifacts: [] ArtifactName: 'not-specified' - TargetDocRepoOwner: 'MicrosoftDocs' - TargetDocRepoName: 'azure-docs-sdk-python' + TargetDocRepoOwner: '' + TargetDocRepoName: '' stages: # The signing stage is responsible for submitting binaries to ESRP for our official signing From af6fe4ed4018fd9f07c3ddb921cbf015153647ad Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Thu, 14 May 2020 17:11:36 -0700 Subject: [PATCH 03/11] update target doc repository --- eng/pipelines/templates/stages/archetype-sdk-client.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml index eba37d0ffd0d..7bcc43d42192 100644 --- a/eng/pipelines/templates/stages/archetype-sdk-client.yml +++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml @@ -3,8 +3,8 @@ parameters: AdditionalModules: [] SDKType: client ServiceDirectory: not-specified - TargetDocRepoOwner: 'MicrosoftDocs' - TargetDocRepoName: 'azure-docs-sdk-python' + TargetDocRepoOwner: 'Azure' + TargetDocRepoName: 'azure-docs-sdk-java' stages: From dada083a5314265353be2295989d8dd4a758346a Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Fri, 15 May 2020 11:10:06 -0700 Subject: [PATCH 04/11] swap everything to use the signed artifacts --- eng/pipelines/templates/stages/archetype-java-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index 7fbb5f504a16..18d1d8f3724d 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -89,7 +89,7 @@ stages: - checkout: self - template: /eng/pipelines/templates/steps/stage-filtered-artifacts.yml parameters: - SourceFolder: ${{parameters.ArtifactName}} + SourceFolder: ${{parameters.ArtifactName}}-signed TargetFolder: ${{artifact.safeName}} PackageName: ${{artifact.name}} displayName: Stage artifacts @@ -119,7 +119,7 @@ stages: - checkout: self - template: /eng/pipelines/templates/steps/stage-filtered-artifacts.yml parameters: - SourceFolder: ${{parameters.ArtifactName}} + SourceFolder: ${{parameters.ArtifactName}}-signed TargetFolder: ${{artifact.safeName}} PackageName: ${{artifact.name}} displayName: Stage artifacts @@ -195,7 +195,7 @@ stages: - checkout: self - template: /eng/pipelines/templates/steps/stage-filtered-artifacts.yml parameters: - SourceFolder: ${{parameters.ArtifactName}} + SourceFolder: ${{parameters.ArtifactName}}-signed TargetFolder: ${{artifact.safeName}} PackageName: ${{artifact.name}} displayName: Stage artifacts From bc012f34572b606153587a5c77db97e6fdefdebf Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Mon, 18 May 2020 14:39:38 -0700 Subject: [PATCH 05/11] get rid of erroneous objects --- eng/pipelines/templates/steps/stage-artifacts.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/pipelines/templates/steps/stage-artifacts.yml b/eng/pipelines/templates/steps/stage-artifacts.yml index 962dc888fd2c..61929573655f 100644 --- a/eng/pipelines/templates/steps/stage-artifacts.yml +++ b/eng/pipelines/templates/steps/stage-artifacts.yml @@ -5,7 +5,6 @@ parameters: steps: - pwsh: | - Get-ChildItem -Recurse $(Pipeline.Workspace) - New-Item -Type Directory -Name ${{parameters.TargetFolder}} -Path $(Pipeline.Workspace) + 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 \ No newline at end of file From 401934523452814d673514a702914d29f571db6e Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Mon, 18 May 2020 15:24:19 -0700 Subject: [PATCH 06/11] resolve bad yml --- .../templates/stages/archetype-java-release.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index 18d1d8f3724d..55914dbf7b92 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -87,12 +87,11 @@ stages: deploy: steps: - checkout: self - - template: /eng/pipelines/templates/steps/stage-filtered-artifacts.yml + - template: /eng/pipelines/templates/steps/stage-artifacts.yml parameters: SourceFolder: ${{parameters.ArtifactName}}-signed TargetFolder: ${{artifact.safeName}} PackageName: ${{artifact.name}} - displayName: Stage artifacts - template: /eng/common/pipelines/templates/steps/create-tags-and-git-release.yml parameters: ArtifactLocation: $(Pipeline.Workspace)/${{artifact.safeName}} @@ -117,13 +116,11 @@ stages: deploy: steps: - checkout: self - - template: /eng/pipelines/templates/steps/stage-filtered-artifacts.yml + - template: /eng/pipelines/templates/steps/stage-artifacts.yml parameters: SourceFolder: ${{parameters.ArtifactName}}-signed TargetFolder: ${{artifact.safeName}} PackageName: ${{artifact.name}} - displayName: Stage artifacts - timeoutInMinutes: 5 - template: /eng/common/pipelines/templates/steps/docs-metadata-release.yml parameters: ArtifactLocation: $(Pipeline.Workspace)/${{artifact.safeName}} @@ -193,12 +190,11 @@ stages: deploy: steps: - checkout: self - - template: /eng/pipelines/templates/steps/stage-filtered-artifacts.yml + - template: /eng/pipelines/templates/steps/stage-artifacts.yml parameters: SourceFolder: ${{parameters.ArtifactName}}-signed TargetFolder: ${{artifact.safeName}} PackageName: ${{artifact.name}} - displayName: Stage artifacts - pwsh: | Get-ChildItem -Recurse $(Pipeline.Workspace)/${{artifact.safeName}} workingDirectory: $(Pipeline.Workspace) From f08dd665a6e31336e24102cf30d677a2d942730c Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Mon, 18 May 2020 15:36:37 -0700 Subject: [PATCH 07/11] commenting publish for easy execution. bumping template version for easy test of the release functionality --- .../stages/archetype-java-release.yml | 38 +++++++++---------- sdk/template/azure-sdk-template/CHANGELOG.md | 3 ++ sdk/template/azure-sdk-template/pom.xml | 2 +- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index 55914dbf7b92..c96e028f05f2 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -155,25 +155,25 @@ stages: - checkout: azure-sdk-build-tools path: azure-sdk-build-tools - template: tools/gpg/gpg.yml@azure-sdk-build-tools - - template: /eng/pipelines/templates/steps/java-publishing.yml - parameters: - ArtifactID: ${{artifact.name}} - GroupID: ${{artifact.groupId}} - ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed - Target: MavenCentral - BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools - JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java - # After publishing to Maven, publish to the azure-sdk-for-java feed. The reason for - # this is that the azure-sdk-for-java feed will have the package available immediately - # whereas Maven can take several hours for the package to become available. - - template: /eng/pipelines/templates/steps/java-publishing.yml - parameters: - ArtifactID: ${{artifact.name}} - GroupID: ${{artifact.groupId}} - ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed - Target: JavaDevFeed - BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools - JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java + # - template: /eng/pipelines/templates/steps/java-publishing.yml + # parameters: + # ArtifactID: ${{artifact.name}} + # GroupID: ${{artifact.groupId}} + # ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed + # Target: MavenCentral + # BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools + # JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java + # # After publishing to Maven, publish to the azure-sdk-for-java feed. The reason for + # # this is that the azure-sdk-for-java feed will have the package available immediately + # # whereas Maven can take several hours for the package to become available. + # - template: /eng/pipelines/templates/steps/java-publishing.yml + # parameters: + # ArtifactID: ${{artifact.name}} + # GroupID: ${{artifact.groupId}} + # ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed + # Target: JavaDevFeed + # BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools + # JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java - ${{if ne(artifact.options.skipPublishDocs, 'true')}}: - deployment: PublishDocs diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index 69bbe9cb1794..6930470676b6 100644 --- a/sdk/template/azure-sdk-template/CHANGELOG.md +++ b/sdk/template/azure-sdk-template/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.0.4-beta.14 (2020-05-18) +- Test Java Release Pipeline + ## 1.0.4-beta.13 (2020-04-14) - Test Java Release Pipeline diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index fd00a651e4b3..7c2c45e6bfef 100644 --- a/sdk/template/azure-sdk-template/pom.xml +++ b/sdk/template/azure-sdk-template/pom.xml @@ -11,7 +11,7 @@ com.azure azure-sdk-template - 1.0.4-beta.13 + 1.0.4-beta.14 Microsoft Azure SDK for Template This package contains Microsoft Azure SDK for Template. From cede1333dc1ae1671ed156e95f046a4acfa11fec Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Mon, 18 May 2020 17:09:02 -0700 Subject: [PATCH 08/11] updating versions so this can actually launch --- eng/jacoco-test-coverage/pom.xml | 2 +- eng/versioning/version_client.txt | 2 +- sdk/template/azure-sdk-template/CHANGELOG.md | 3 +++ sdk/template/azure-sdk-template/pom.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index bb6bb862453d..e1eb2e1f8c5c 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -185,7 +185,7 @@ com.azure azure-sdk-template - 1.0.4-beta.13 + 1.0.4-beta.15 diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index b9a190ff7277..24170ffa9d60 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -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 diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index 6930470676b6..e60912b7446e 100644 --- a/sdk/template/azure-sdk-template/CHANGELOG.md +++ b/sdk/template/azure-sdk-template/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 1.0.4-beta.15 (2020-05-18) +- Test Java Release Pipeline + ## 1.0.4-beta.14 (2020-05-18) - Test Java Release Pipeline diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index 7c2c45e6bfef..70bc1c071068 100644 --- a/sdk/template/azure-sdk-template/pom.xml +++ b/sdk/template/azure-sdk-template/pom.xml @@ -11,7 +11,7 @@ com.azure azure-sdk-template - 1.0.4-beta.14 + 1.0.4-beta.15 Microsoft Azure SDK for Template This package contains Microsoft Azure SDK for Template. From bb6e832ac2782c9d663b65cdf38cf994c9f84365 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Mon, 18 May 2020 18:07:29 -0700 Subject: [PATCH 09/11] set dependsOn value for update docs.ms to publishpackage --- .../stages/archetype-java-release.yml | 72 +++++++++---------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index c96e028f05f2..97cff6c46f6a 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -99,43 +99,6 @@ stages: ReleaseSha: $(Build.SourceVersion) RepoId: Azure/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: VerifyReleaseVersion - - 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.skipPublishPackage, 'true')}}: - deployment: PublishPackage displayName: "Publish to Maven Central" @@ -175,6 +138,41 @@ 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 From a5574ffc7ec6fa0e92a7600502ceb76a191b7baa Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Mon, 18 May 2020 18:07:58 -0700 Subject: [PATCH 10/11] re-enable publishing to maven. artifact staging seems to be working appropriately --- .../stages/archetype-java-release.yml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index 97cff6c46f6a..c6ff126613f8 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -118,25 +118,25 @@ stages: - checkout: azure-sdk-build-tools path: azure-sdk-build-tools - template: tools/gpg/gpg.yml@azure-sdk-build-tools - # - template: /eng/pipelines/templates/steps/java-publishing.yml - # parameters: - # ArtifactID: ${{artifact.name}} - # GroupID: ${{artifact.groupId}} - # ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed - # Target: MavenCentral - # BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools - # JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java - # # After publishing to Maven, publish to the azure-sdk-for-java feed. The reason for - # # this is that the azure-sdk-for-java feed will have the package available immediately - # # whereas Maven can take several hours for the package to become available. - # - template: /eng/pipelines/templates/steps/java-publishing.yml - # parameters: - # ArtifactID: ${{artifact.name}} - # GroupID: ${{artifact.groupId}} - # ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed - # Target: JavaDevFeed - # BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools - # JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java + - template: /eng/pipelines/templates/steps/java-publishing.yml + parameters: + ArtifactID: ${{artifact.name}} + GroupID: ${{artifact.groupId}} + ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed + Target: MavenCentral + BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools + JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java + # After publishing to Maven, publish to the azure-sdk-for-java feed. The reason for + # this is that the azure-sdk-for-java feed will have the package available immediately + # whereas Maven can take several hours for the package to become available. + - template: /eng/pipelines/templates/steps/java-publishing.yml + parameters: + ArtifactID: ${{artifact.name}} + GroupID: ${{artifact.groupId}} + ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed + Target: JavaDevFeed + BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools + JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java - ${{if ne(artifact.options.skipPublishDocs, 'true')}}: - deployment: PublicDocsMs From a72537c20aeae8b028b26ec7b46c6033d4bdc6b4 Mon Sep 17 00:00:00 2001 From: James Suplizio Date: Tue, 19 May 2020 06:42:23 -0700 Subject: [PATCH 11/11] Update CHANGELOG.md 1.0.4-beta.15 is "Unreleased", it wasn't released yesterday. --- sdk/template/azure-sdk-template/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index e60912b7446e..2ab722806044 100644 --- a/sdk/template/azure-sdk-template/CHANGELOG.md +++ b/sdk/template/azure-sdk-template/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.0.4-beta.15 (2020-05-18) +## 1.0.4-beta.15 (Unreleased) - Test Java Release Pipeline ## 1.0.4-beta.14 (2020-05-18)