Skip to content

Commit

Permalink
Artifact segregation (#10490)
Browse files Browse the repository at this point in the history
* 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.

Tweak staging logic.

Tweak changelog.

Increment package version after release of com.azure azure-sdk-template (#13065)

Add recursive copy to stage artifacts.

Fix changelog

Increment package version after release of com.azure azure-sdk-template (#13066)

Another run through the pipeline.

Increment package version after release of com.azure azure-sdk-template (#13067)

Flatten artifacts.

Increment package version after release of com.azure azure-sdk-template (#13068)

More debugging.

Tweak filtering.
  • Loading branch information
mitchdenny committed Jul 13, 2020
1 parent b26c0da commit 40181ae
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 8 deletions.
2 changes: 1 addition & 1 deletion eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-sdk-template</artifactId>
<version>1.0.4-beta.20</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
<version>1.0.4-beta.24</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 7 additions & 2 deletions eng/pipelines/templates/steps/stage-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,10 @@ 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}}
displayName: Stage artifacts
$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
2 changes: 1 addition & 1 deletion eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand Down
15 changes: 14 additions & 1 deletion sdk/template/azure-sdk-template/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
# Release History

## 1.0.4-beta.20 (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)

## 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)

## 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)
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.20</version> <!-- {x-version-update;com.azure:azure-sdk-template;current} -->
<version>1.0.4-beta.24</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

0 comments on commit 40181ae

Please sign in to comment.