From 2c5aa7d5a3edd4ed36a408012d4746c09a15c8a6 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 28 Apr 2020 15:02:10 +1000 Subject: [PATCH 01/14] Artifact segregation (#10490) * Do a deployment into the staging directory to segregate artifacts. * Add skips for checkstyle, spotbugs and rev API since we now do deploy during build. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 23e1e2c3d394..ef828b3ab10b 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -107,8 +107,8 @@ jobs: displayName: 'Build and Package , JDK Version: $(JavaBuildVersion)' inputs: mavenPomFile: pom.xml - goals: 'package' - options: '$(DefaultOptions) "-DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -DskipTests -Dinject-codesnippets -Dgenerate-overview -pl $(ProjectList) -am' # We include template-module so we ensure it always builds in CI + goals: 'deploy' + options: '$(DefaultOptions) -DskipTests -Dinject-codesnippets -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(Build.ArtifactStagingDirectory)' # We include template-module so we ensure it always builds in CI mavenOptions: '$(MemoryOptions) $(LoggingOptions)' javaHomeOption: 'JDKVersion' jdkVersionOption: $(JavaBuildVersion) From d0005c26781251195193a3f7fb2d87e32a89ca71 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 28 Apr 2020 16:09:47 +1000 Subject: [PATCH 02/14] Tweak staging logic. --- eng/pipelines/templates/steps/stage-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/stage-artifacts.yml b/eng/pipelines/templates/steps/stage-artifacts.yml index 61929573655f..af1acc0fa070 100644 --- a/eng/pipelines/templates/steps/stage-artifacts.yml +++ b/eng/pipelines/templates/steps/stage-artifacts.yml @@ -7,4 +7,4 @@ 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 \ No newline at end of file + displayName: Stage artifacts From b8a6c6af3ad9971dccf725f193b9026f8ff3cc1f Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Mon, 13 Jul 2020 11:06:32 +1000 Subject: [PATCH 03/14] Tweak changelog. --- sdk/template/azure-sdk-template/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index aeecf4eeebd0..563315de5e3b 100644 --- a/sdk/template/azure-sdk-template/CHANGELOG.md +++ b/sdk/template/azure-sdk-template/CHANGELOG.md @@ -1,6 +1,7 @@ # Release History -## 1.0.4-beta.20 (Unreleased) +## 1.0.4-beta.20 (2020-07-13) +- Test Java Release Pipeline (normal docs, normal sources) ## 1.0.4-beta.19 (2020-05-20) - Test Java Release Pipeline (normal docs, normal sources) From fc607ad70d1857b47ff4ef4f02110828fc6a8c45 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Sun, 12 Jul 2020 19:31:00 -0700 Subject: [PATCH 04/14] Increment package version after release of com.azure azure-sdk-template (#13065) --- 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 63e664f3d819..2111049a5115 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -225,7 +225,7 @@ com.azure azure-sdk-template - 1.0.4-beta.20 + 1.0.4-beta.21 diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index d9332004bbf1..0f7df076f134 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -35,7 +35,7 @@ com.azure:azure-search-documents;1.0.0-beta.4;11.0.0 com.azure:azure-security-keyvault-certificates;4.0.4;4.1.0-beta.4 com.azure:azure-security-keyvault-keys;4.1.4;4.2.0-beta.5 com.azure:azure-security-keyvault-secrets;4.1.4;4.2.0-beta.4 -com.azure:azure-sdk-template;1.0.4-beta.19;1.0.4-beta.20 +com.azure:azure-sdk-template;1.0.4-beta.20;1.0.4-beta.21 com.azure:azure-spring-data-cosmos;3.0.0-beta.1;3.0.0-beta.1 com.azure:azure-storage-blob;12.8.0-beta.1;12.8.0-beta.2 com.azure:azure-storage-blob-batch;12.6.0-beta.1;12.6.0-beta.2 diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index 563315de5e3b..51e144b02ff2 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.21 (Unreleased) + + ## 1.0.4-beta.20 (2020-07-13) - Test Java Release Pipeline (normal docs, normal sources) diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index a8087f8d000b..1fde78e7ffcf 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.20 + 1.0.4-beta.21 Microsoft Azure SDK for Template This package contains Microsoft Azure SDK for Template. From 7477946a4f8336c9267081d6ffc340b36c6857de Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Mon, 13 Jul 2020 12:33:27 +1000 Subject: [PATCH 05/14] Add recursive copy to stage artifacts. --- eng/pipelines/templates/steps/stage-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/stage-artifacts.yml b/eng/pipelines/templates/steps/stage-artifacts.yml index af1acc0fa070..93c9947dba78 100644 --- a/eng/pipelines/templates/steps/stage-artifacts.yml +++ b/eng/pipelines/templates/steps/stage-artifacts.yml @@ -6,5 +6,5 @@ parameters: 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}} + Copy-Item -Recurse $(Pipeline.Workspace)/${{parameters.SourceFolder}}/${{parameters.PackageName}}-[0-9]*.[0-9]*.[0-9]* $(Pipeline.Workspace)/${{parameters.TargetFolder}} displayName: Stage artifacts From 7056e56a4ebbf7bb7a566d65453b2c91b88664f1 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Mon, 13 Jul 2020 12:34:17 +1000 Subject: [PATCH 06/14] Fix changelog --- sdk/template/azure-sdk-template/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index 51e144b02ff2..afb4535ae5c2 100644 --- a/sdk/template/azure-sdk-template/CHANGELOG.md +++ b/sdk/template/azure-sdk-template/CHANGELOG.md @@ -1,7 +1,7 @@ # Release History -## 1.0.4-beta.21 (Unreleased) - +## 1.0.4-beta.21 (2020-07-13) +- Test Java Release Pipeline (normal docs, normal sources) ## 1.0.4-beta.20 (2020-07-13) - Test Java Release Pipeline (normal docs, normal sources) From f1b4ebb272ed8484670a15f38ae4529d2606365a Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Sun, 12 Jul 2020 20:03:57 -0700 Subject: [PATCH 07/14] Increment package version after release of com.azure azure-sdk-template (#13066) --- 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 2111049a5115..eed2a00a65a8 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -225,7 +225,7 @@ com.azure azure-sdk-template - 1.0.4-beta.21 + 1.0.4-beta.22 diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 0f7df076f134..0a9bacb629d4 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -35,7 +35,7 @@ com.azure:azure-search-documents;1.0.0-beta.4;11.0.0 com.azure:azure-security-keyvault-certificates;4.0.4;4.1.0-beta.4 com.azure:azure-security-keyvault-keys;4.1.4;4.2.0-beta.5 com.azure:azure-security-keyvault-secrets;4.1.4;4.2.0-beta.4 -com.azure:azure-sdk-template;1.0.4-beta.20;1.0.4-beta.21 +com.azure:azure-sdk-template;1.0.4-beta.21;1.0.4-beta.22 com.azure:azure-spring-data-cosmos;3.0.0-beta.1;3.0.0-beta.1 com.azure:azure-storage-blob;12.8.0-beta.1;12.8.0-beta.2 com.azure:azure-storage-blob-batch;12.6.0-beta.1;12.6.0-beta.2 diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index afb4535ae5c2..df797c140805 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.22 (Unreleased) + + ## 1.0.4-beta.21 (2020-07-13) - Test Java Release Pipeline (normal docs, normal sources) diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index 1fde78e7ffcf..6f73d8632cf6 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.21 + 1.0.4-beta.22 Microsoft Azure SDK for Template This package contains Microsoft Azure SDK for Template. From 6bb49f9f076eb8734cb6474995ceb6a4cf66f07d Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Mon, 13 Jul 2020 13:07:06 +1000 Subject: [PATCH 08/14] Another run through the pipeline. --- eng/pipelines/templates/steps/stage-artifacts.yml | 2 +- sdk/template/azure-sdk-template/CHANGELOG.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/steps/stage-artifacts.yml b/eng/pipelines/templates/steps/stage-artifacts.yml index 93c9947dba78..372fd5d996f2 100644 --- a/eng/pipelines/templates/steps/stage-artifacts.yml +++ b/eng/pipelines/templates/steps/stage-artifacts.yml @@ -6,5 +6,5 @@ parameters: steps: - pwsh: | New-Item -Force -Type Directory -Name ${{parameters.TargetFolder}} -Path $(Pipeline.Workspace) - Copy-Item -Recurse $(Pipeline.Workspace)/${{parameters.SourceFolder}}/${{parameters.PackageName}}-[0-9]*.[0-9]*.[0-9]* $(Pipeline.Workspace)/${{parameters.TargetFolder}} + Copy-Item -Recurse -Path $(Pipeline.Workspace)/${{parameters.SourceFolder}} -Filter ${{parameters.PackageName}}-[0-9]*.[0-9]*.[0-9]* -Destination $(Pipeline.Workspace)/${{parameters.TargetFolder}} displayName: Stage artifacts diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index df797c140805..40192bb4f076 100644 --- a/sdk/template/azure-sdk-template/CHANGELOG.md +++ b/sdk/template/azure-sdk-template/CHANGELOG.md @@ -1,7 +1,7 @@ # Release History -## 1.0.4-beta.22 (Unreleased) - +## 1.0.4-beta.22 (2020-07-13) +- Test Java Release Pipeline (normal docs, normal sources) ## 1.0.4-beta.21 (2020-07-13) - Test Java Release Pipeline (normal docs, normal sources) From d0218fef5321c4fa71624b4d054f82c2233a63ba Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Sun, 12 Jul 2020 21:19:16 -0700 Subject: [PATCH 09/14] Increment package version after release of com.azure azure-sdk-template (#13067) --- 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 eed2a00a65a8..123d41c73008 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -225,7 +225,7 @@ com.azure azure-sdk-template - 1.0.4-beta.22 + 1.0.4-beta.23 diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 0a9bacb629d4..0b9d4ec4556e 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -35,7 +35,7 @@ com.azure:azure-search-documents;1.0.0-beta.4;11.0.0 com.azure:azure-security-keyvault-certificates;4.0.4;4.1.0-beta.4 com.azure:azure-security-keyvault-keys;4.1.4;4.2.0-beta.5 com.azure:azure-security-keyvault-secrets;4.1.4;4.2.0-beta.4 -com.azure:azure-sdk-template;1.0.4-beta.21;1.0.4-beta.22 +com.azure:azure-sdk-template;1.0.4-beta.22;1.0.4-beta.23 com.azure:azure-spring-data-cosmos;3.0.0-beta.1;3.0.0-beta.1 com.azure:azure-storage-blob;12.8.0-beta.1;12.8.0-beta.2 com.azure:azure-storage-blob-batch;12.6.0-beta.1;12.6.0-beta.2 diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index 40192bb4f076..4bfe2eefc410 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.23 (Unreleased) + + ## 1.0.4-beta.22 (2020-07-13) - Test Java Release Pipeline (normal docs, normal sources) diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index 6f73d8632cf6..2ffe940e52e6 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.22 + 1.0.4-beta.23 Microsoft Azure SDK for Template This package contains Microsoft Azure SDK for Template. From d82c3ad7d0baccdb5020317c8f5bd199e9cc7c13 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Mon, 13 Jul 2020 14:21:10 +1000 Subject: [PATCH 10/14] Flatten artifacts. --- eng/pipelines/templates/steps/stage-artifacts.yml | 3 ++- sdk/template/azure-sdk-template/CHANGELOG.md | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/steps/stage-artifacts.yml b/eng/pipelines/templates/steps/stage-artifacts.yml index 372fd5d996f2..22ccaa46c09e 100644 --- a/eng/pipelines/templates/steps/stage-artifacts.yml +++ b/eng/pipelines/templates/steps/stage-artifacts.yml @@ -6,5 +6,6 @@ parameters: steps: - pwsh: | New-Item -Force -Type Directory -Name ${{parameters.TargetFolder}} -Path $(Pipeline.Workspace) - Copy-Item -Recurse -Path $(Pipeline.Workspace)/${{parameters.SourceFolder}} -Filter ${{parameters.PackageName}}-[0-9]*.[0-9]*.[0-9]* -Destination $(Pipeline.Workspace)/${{parameters.TargetFolder}} + $items = Get-ChildItem -Recurse -Path $(Pipeline.Workspace)/${{parameters.SourceFolder}} -Filter ${{parameters.PackageName}}-[0-9]*.[0-9]*.[0-9]* + $items | Copy-Item -Destination $(Pipeline.Workspace)/${{parameters.TargetFolder}} displayName: Stage artifacts diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index 4bfe2eefc410..a52b3c566925 100644 --- a/sdk/template/azure-sdk-template/CHANGELOG.md +++ b/sdk/template/azure-sdk-template/CHANGELOG.md @@ -1,7 +1,7 @@ # Release History -## 1.0.4-beta.23 (Unreleased) - +## 1.0.4-beta.23 (2020-07-13) +- Test Java Release Pipeline (normal docs, normal sources) ## 1.0.4-beta.22 (2020-07-13) - Test Java Release Pipeline (normal docs, normal sources) From 4b854d91a4d0a90b2898280abf579bf7bfa79da5 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Sun, 12 Jul 2020 22:02:08 -0700 Subject: [PATCH 11/14] Increment package version after release of com.azure azure-sdk-template (#13068) --- 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 123d41c73008..55b662f30d0b 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -225,7 +225,7 @@ com.azure azure-sdk-template - 1.0.4-beta.23 + 1.0.4-beta.24 diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 0b9d4ec4556e..11d1d78c4a1b 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -35,7 +35,7 @@ com.azure:azure-search-documents;1.0.0-beta.4;11.0.0 com.azure:azure-security-keyvault-certificates;4.0.4;4.1.0-beta.4 com.azure:azure-security-keyvault-keys;4.1.4;4.2.0-beta.5 com.azure:azure-security-keyvault-secrets;4.1.4;4.2.0-beta.4 -com.azure:azure-sdk-template;1.0.4-beta.22;1.0.4-beta.23 +com.azure:azure-sdk-template;1.0.4-beta.23;1.0.4-beta.24 com.azure:azure-spring-data-cosmos;3.0.0-beta.1;3.0.0-beta.1 com.azure:azure-storage-blob;12.8.0-beta.1;12.8.0-beta.2 com.azure:azure-storage-blob-batch;12.6.0-beta.1;12.6.0-beta.2 diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index a52b3c566925..e3507db386d7 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.24 (Unreleased) + + ## 1.0.4-beta.23 (2020-07-13) - Test Java Release Pipeline (normal docs, normal sources) diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index 2ffe940e52e6..e5f253166553 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.23 + 1.0.4-beta.24 Microsoft Azure SDK for Template This package contains Microsoft Azure SDK for Template. From 8cc8be7a0a49d30c0e837d2830b82e658e6f4fbd Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Mon, 13 Jul 2020 15:02:38 +1000 Subject: [PATCH 12/14] More debugging. --- eng/pipelines/templates/steps/stage-artifacts.yml | 1 + sdk/template/azure-sdk-template/CHANGELOG.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/steps/stage-artifacts.yml b/eng/pipelines/templates/steps/stage-artifacts.yml index 22ccaa46c09e..40d583ee5829 100644 --- a/eng/pipelines/templates/steps/stage-artifacts.yml +++ b/eng/pipelines/templates/steps/stage-artifacts.yml @@ -8,4 +8,5 @@ steps: New-Item -Force -Type Directory -Name ${{parameters.TargetFolder}} -Path $(Pipeline.Workspace) $items = Get-ChildItem -Recurse -Path $(Pipeline.Workspace)/${{parameters.SourceFolder}} -Filter ${{parameters.PackageName}}-[0-9]*.[0-9]*.[0-9]* $items | Copy-Item -Destination $(Pipeline.Workspace)/${{parameters.TargetFolder}} + Get-ChildItem $(Pipeline.Workspace)/${{parameters.TargetFolder}} displayName: Stage artifacts diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index e3507db386d7..0390cf4ecc24 100644 --- a/sdk/template/azure-sdk-template/CHANGELOG.md +++ b/sdk/template/azure-sdk-template/CHANGELOG.md @@ -1,7 +1,7 @@ # Release History -## 1.0.4-beta.24 (Unreleased) - +## 1.0.4-beta.24 (2020-07-13) +- Test Java Release Pipeline (normal docs, normal sources) ## 1.0.4-beta.23 (2020-07-13) - Test Java Release Pipeline (normal docs, normal sources) From fc3f0a843f25beed100dd8d33b3cdc88b960defb Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Mon, 13 Jul 2020 15:39:29 +1000 Subject: [PATCH 13/14] Tweak filtering. --- eng/pipelines/templates/steps/stage-artifacts.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/steps/stage-artifacts.yml b/eng/pipelines/templates/steps/stage-artifacts.yml index 40d583ee5829..7d2d4cdbdd7c 100644 --- a/eng/pipelines/templates/steps/stage-artifacts.yml +++ b/eng/pipelines/templates/steps/stage-artifacts.yml @@ -6,7 +6,10 @@ parameters: steps: - pwsh: | New-Item -Force -Type Directory -Name ${{parameters.TargetFolder}} -Path $(Pipeline.Workspace) - $items = Get-ChildItem -Recurse -Path $(Pipeline.Workspace)/${{parameters.SourceFolder}} -Filter ${{parameters.PackageName}}-[0-9]*.[0-9]*.[0-9]* - $items | Copy-Item -Destination $(Pipeline.Workspace)/${{parameters.TargetFolder}} + $items = Get-ChildItem -Recurse -Path $(Pipeline.Workspace)/${{parameters.SourceFolder}} + Write-Host "Found $($items.Count) total items in source folder" + $filteredItems = $items | Where-Object -FilterScript { $_.Name -like "azure-sdk-template-[0-9]*.[0-9]*.[0-9]*-*" } + Write-Host "Found $($filteredItems.Count) items which match filter criteria" + $filteredItems | Copy-Item -Destination $(Pipeline.Workspace)/${{parameters.TargetFolder}} Get-ChildItem $(Pipeline.Workspace)/${{parameters.TargetFolder}} displayName: Stage artifacts From 076418eb034c75c3e15c3dd1552199c881de6048 Mon Sep 17 00:00:00 2001 From: azure-sdk Date: Mon, 13 Jul 2020 06:05:33 +0000 Subject: [PATCH 14/14] Increment package version after release of com.azure azure-sdk-template --- 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 55b662f30d0b..c2137f96f58a 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -225,7 +225,7 @@ com.azure azure-sdk-template - 1.0.4-beta.24 + 1.0.4-beta.25 diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 11d1d78c4a1b..8059dc78aa7f 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -35,7 +35,7 @@ com.azure:azure-search-documents;1.0.0-beta.4;11.0.0 com.azure:azure-security-keyvault-certificates;4.0.4;4.1.0-beta.4 com.azure:azure-security-keyvault-keys;4.1.4;4.2.0-beta.5 com.azure:azure-security-keyvault-secrets;4.1.4;4.2.0-beta.4 -com.azure:azure-sdk-template;1.0.4-beta.23;1.0.4-beta.24 +com.azure:azure-sdk-template;1.0.4-beta.24;1.0.4-beta.25 com.azure:azure-spring-data-cosmos;3.0.0-beta.1;3.0.0-beta.1 com.azure:azure-storage-blob;12.8.0-beta.1;12.8.0-beta.2 com.azure:azure-storage-blob-batch;12.6.0-beta.1;12.6.0-beta.2 diff --git a/sdk/template/azure-sdk-template/CHANGELOG.md b/sdk/template/azure-sdk-template/CHANGELOG.md index 0390cf4ecc24..e753831ad69d 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.25 (Unreleased) + + ## 1.0.4-beta.24 (2020-07-13) - Test Java Release Pipeline (normal docs, normal sources) diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index e5f253166553..8e9f67f7e9b4 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.24 + 1.0.4-beta.25 Microsoft Azure SDK for Template This package contains Microsoft Azure SDK for Template.