Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
540a16d
Initial changes
aayush3011 Apr 24, 2024
6f49c75
Initial changes
aayush3011 Apr 25, 2024
97509eb
Merge branch 'main' into users/akataria/nonStreamingOrderBy
aayush3011 Apr 25, 2024
938279a
Increment versions for core releases (#40003)
azure-sdk May 2, 2024
c6c520e
Ensure ServiceBus session idle timeout fall back to retry-options::tr…
anuchandy May 2, 2024
222f2d9
Added Alpha3 Java Media Streaming Events (#40002)
v-durgeshs May 2, 2024
387170a
Update version of github-event-processor to 1.0.0-dev.20240502.2 (#40…
azure-sdk May 2, 2024
b1e8fdc
Prepare May 2024 Identity Release (#40006)
billwert May 2, 2024
c3c4648
Prepare Identity Broker May 2024 Release (#40014)
billwert May 2, 2024
a5127c6
Increment package versions for identity releases (#40015)
azure-sdk May 2, 2024
ba334df
[JobRouter] SDK Review updates (#40011)
williamzhao87 May 2, 2024
5682de3
FixFaultInjectionRuleFailedToApplyPerPartitionInGatewayMode (#40005)
xinlian12 May 3, 2024
39cb79f
azure-cosmos-test_1.0.0.beta.7Release (#40021)
xinlian12 May 3, 2024
86b36d3
Merge branch 'main' into users/akataria/nonStreamingOrderBy
aayush3011 May 3, 2024
9a38357
Fixed existsById API in ReactiveCosmosTemplate (#40022)
kushagraThapar May 3, 2024
a979c11
Initial changes
aayush3011 May 3, 2024
e2756a5
Initial changes
aayush3011 May 3, 2024
d768057
Skip Recorded test and delete Event record until test proxy to work w…
minwoolee-msft May 3, 2024
71b1905
Fix invalid CODEOWNERS (#40032)
alzimmermsft May 3, 2024
8be2277
Initial changes
aayush3011 May 3, 2024
28a2b5a
ServiceBus: fix session tracing (#39962)
May 3, 2024
deff567
[Automation] Generate SDK based on TypeSpec 0.15.15 (#40048)
azure-sdk May 6, 2024
058f8a8
[CODEOWNERS] Updates for org changes (#40049)
jsquire May 6, 2024
9406783
Move from using the docker image to java2docfx for docs validation (#…
JimSuplizio May 6, 2024
6dee85b
owners (#39686)
harsimar May 6, 2024
61b177c
Use ClientLogger in testing output (#40010)
alzimmermsft May 6, 2024
8349880
Fix null pointer exception and context usage (#40053)
alzimmermsft May 6, 2024
c75b369
Rename AML to AzureMachineLearning (#40056)
alzimmermsft May 6, 2024
af7f403
Fixed the Key Vault `test-resources.json` file to properly configure …
vcolin7 May 6, 2024
c9da24c
Close response body in bearer policy (#40052)
May 6, 2024
7055e66
Running Prepare-Release for azure-messaging-servicebus 7.17.0 (#40058)
anuchandy May 7, 2024
4428897
mgmt, TypeSpec code generation pipeline (#39963)
XiaofeiCao May 7, 2024
a755e6a
Add codeowner linter owners (#39997)
weshaggard May 7, 2024
23b7d1e
Update to ESRP task version that supports federated auth (#40059)
hallipr May 7, 2024
94bd0d4
Increment package versions for cosmos releases (#40031)
azure-sdk May 7, 2024
149bd61
Update azure-sdk-build-tools Repository Resource Refs in Yaml files (…
azure-sdk May 7, 2024
847a8ae
Add reduced embeddings sample to azure-search-documents (#40069)
alzimmermsft May 7, 2024
376955f
Search May Preview Regen Updates (#40057)
jairmyree May 7, 2024
f01f7f4
Preparing Search May 2024 Beta Release (#40071)
jairmyree May 7, 2024
e491b9d
Resolving comments
aayush3011 May 7, 2024
151bb50
Fixing build issues
aayush3011 May 7, 2024
c86b87e
eng, update autorest.java, improve error output in sdk automation (#4…
weidongxu-microsoft May 8, 2024
a3d2d26
Merge to main after spring cloud azure 4.18.0 released (#40075)
Netyyyy May 8, 2024
f6909fb
Miscellaneous Core performance improvements (#39552)
alzimmermsft May 8, 2024
73afd5b
Merge branch 'Azure:main' into users/akataria/nonStreamingOrderBy
aayush3011 May 8, 2024
3271984
Increment package versions for search releases (#40072)
azure-sdk May 9, 2024
0e921d2
Update io.fabric8:kubernetes-client (#40086)
jairmyree May 9, 2024
b2a4bef
Increment package versions for servicebus releases (#40094)
azure-sdk May 9, 2024
6884420
Emit stable auto-instrumented otel metrics (#39960)
heyams May 9, 2024
3b0d751
Merge branch 'Azure:main' into users/akataria/nonStreamingOrderBy
aayush3011 May 9, 2024
87572f7
Merge branch 'feature/vector_search' into users/akataria/nonStreaming…
aayush3011 May 9, 2024
179f904
Initial changes
aayush3011 May 9, 2024
5602e33
Merge branch 'users/akataria/nonStreamingOrderBy' of github.com:aayus…
aayush3011 May 9, 2024
36ab9b7
Merge branch 'feature/vector_search' into users/akataria/nonStreaming…
aayush3011 May 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move from using the docker image to java2docfx for docs validation (#…
…39744)

* Move from using the docker image to java2docfx for docs validation

* Temporarily turn on docs processing for template libraries for testing

* Actually install the rex validation tool

* Fix the if not Test-Path statement

* Update java2docfx version and add a couple of diagnostics output lines

* Add missing close paren

* Ensure that Sort-Object always returns an array even if there's only one item

* add another piece of diagnostics output

* trying one more thing

* remove some diag, add other

* Remove the additional diagnostics, add permanent output message

* Invoke java -jar on java2docfx to show the help command to ensure the install is okay

* fiddling with the java -jar command

* Set the working directory to the java2docfx directory before executing the mvn dependency download

* Actually create the directory before trying to set location...oops

* Update rex validation to verify MAVEN_HOME is set

* Updates for Java PR 39875 which had changes from this PR that were more immediate

* Update java2docfx version

* remove check for MAVEN_HOME which was only for testing

* Update the version of java2docfx to test a fix

* Update version of java2docfx to 1.0.4

* revert template's ci.yml changes that were only necessary to test java2docfx
  • Loading branch information
JimSuplizio authored May 6, 2024
commit 940678343fc40b78b4792f06c7a5fe823d4c3110
24 changes: 3 additions & 21 deletions eng/pipelines/docindex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
DailyDocRepoLocation: $(Pipeline.Workspace)/daily
DocRepoOwner: Azure
DocRepoName: azure-docs-sdk-java
DocValidationImageId: azuresdkimages.azurecr.io/javarefautocr:latest
steps:
# Sync docs repo onboarding files/folders
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
Expand All @@ -29,10 +28,6 @@ jobs:
WorkingDirectory: $(DocRepoLocation)
- Name: azure-sdk/$(DocRepoName)
WorkingDirectory: $(DailyDocRepoLocation)
# Pull and build the docker image.
- template: /eng/common/pipelines/templates/steps/docker-pull-image.yml
parameters:
ImageId: "$(DocValidationImageId)"

- task: Powershell@2
inputs:
Expand All @@ -46,7 +41,7 @@ jobs:
inputs:
pwsh: true
filePath: eng/common/scripts/Update-DocsMsPackages.ps1
arguments: -DocRepoLocation $(DocRepoLocation) -ImageId '$(DocValidationImageId)'
arguments: -DocRepoLocation $(DocRepoLocation)
displayName: Update Docs Onboarding for main branch
condition: and(succeeded(), or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Force.MainUpdate'], 'true')))

Expand Down Expand Up @@ -85,7 +80,7 @@ jobs:
parameters:
BaseRepoBranch: $(DefaultBranch)
BaseRepoOwner: $(DocRepoOwner)
CommitMsg: "Update docs CI configuration"
CommitMsg: "Update docs CI configuration Build: $(System.CollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId)"
TargetRepoName: $(DocRepoName)
TargetRepoOwner: $(DocRepoOwner)
WorkingDirectory: $(DocRepoLocation)
Expand All @@ -95,20 +90,7 @@ jobs:
parameters:
DailyBranchVariableName: DailyDocsBranchName

# Docs daily updates is supposed to download packages from public feed repository, so we have to specify additional repositories in a POM or the profile.
# Here is maven documentation: https://maven.apache.org/guides/mini/guide-multiple-repositories.html
- powershell: |
# Linux mvn `setting.xml` is sitting under path `~/.m2/setting.xml`
Get-Command mvn
if (!(Test-Path '~/.m2/')) {
mkdir ~/.m2/
}
if (Test-Path '~/.m2/setting.xml') {
Write-Host "'setting.xml' exists. Overwriting the file to support multiple repositories."
}
Copy-Item "./eng/repo-docs/docms/daily.update.setting.xml" -Destination "~/.m2/settings.xml"
displayName: 'Configure mvn'
workingDirectory: $(Build.SourcesDirectory)
- template: /eng/pipelines/templates/steps/mvn-linux-settings-for-docs.yml

- task: Powershell@2
inputs:
Expand Down
13 changes: 4 additions & 9 deletions eng/pipelines/templates/stages/archetype-java-release-batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,6 @@ stages:
image: azsdk-pool-mms-ubuntu-2004-1espt
os: linux

variables:
- name: DocValidationImageId
value: azuresdkimages.azurecr.io/javarefautocr:latest

strategy:
runOnce:
deploy:
Expand All @@ -341,6 +337,8 @@ stages:

- template: /eng/pipelines/templates/steps/mvn-linux-repository-settings.yml

- template: /eng/pipelines/templates/steps/install-rex-validation-tool.yml

- template: /eng/common/pipelines/templates/steps/update-docsms-metadata.yml
parameters:
PackageInfoLocations:
Expand All @@ -354,7 +352,6 @@ stages:
SparseCheckoutPaths:
- docs-ref-services/
- metadata/
DocValidationImageId: "$(DocValidationImageId)"

- deployment: PublishDocs
displayName: Publish Docs to GitHubIO Blob Storage
Expand Down Expand Up @@ -464,9 +461,6 @@ stages:
name: azsdk-pool-mms-ubuntu-2004-general
image: azsdk-pool-mms-ubuntu-2004-1espt
os: linux
variables:
- name: DocValidationImageId
value: azuresdkimages.azurecr.io/javarefautocr:latest
steps:
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
parameters:
Expand All @@ -485,6 +479,8 @@ stages:

- template: /eng/pipelines/templates/steps/mvn-linux-repository-settings.yml

- template: /eng/pipelines/templates/steps/install-rex-validation-tool.yml

- template: /eng/common/pipelines/templates/steps/update-docsms-metadata.yml
parameters:
PackageInfoLocations:
Expand All @@ -499,6 +495,5 @@ stages:
SparseCheckoutPaths:
- docs-ref-services/
- metadata/
DocValidationImageId: "$(DocValidationImageId)"

- template: /eng/common/pipelines/templates/steps/docsms-ensure-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,6 @@ stages:

variables:
- template: /eng/pipelines/templates/variables/globals.yml
- name: DocValidationImageId
value: azuresdkimages.azurecr.io/javarefautocr:latest

strategy:
runOnce:
Expand All @@ -261,6 +259,8 @@ stages:

- template: /eng/pipelines/templates/steps/mvn-linux-repository-settings.yml

- template: /eng/pipelines/templates/steps/install-rex-validation-tool.yml

- template: /eng/common/pipelines/templates/steps/update-docsms-metadata.yml
parameters:
PackageInfoLocations:
Expand All @@ -274,7 +274,6 @@ stages:
SparseCheckoutPaths:
- docs-ref-services/
- metadata/
DocValidationImageId: "$(DocValidationImageId)"

- deployment: PublishDocs
displayName: Publish Docs to GitHubIO Blob Storage
Expand Down
11 changes: 4 additions & 7 deletions eng/pipelines/templates/stages/archetype-java-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,6 @@ stages:

variables:
- template: /eng/pipelines/templates/variables/globals.yml
- name: DocValidationImageId
value: azuresdkimages.azurecr.io/javarefautocr:latest

strategy:
runOnce:
Expand All @@ -275,10 +273,11 @@ stages:
- download: current
displayName: 'Download Artifact: ${{parameters.ArtifactName}}'
artifact: ${{parameters.ArtifactName}}
# Pull and build the docker image.

- template: /eng/pipelines/templates/steps/mvn-linux-repository-settings.yml

- template: /eng/pipelines/templates/steps/install-rex-validation-tool.yml

- template: /eng/common/pipelines/templates/steps/update-docsms-metadata.yml
parameters:
PackageInfoLocations:
Expand All @@ -290,7 +289,6 @@ stages:
SparseCheckoutPaths:
- docs-ref-services/
- metadata/
DocValidationImageId: "$(DocValidationImageId)"

- ${{if ne(artifact.skipPublishDocGithubIo, 'true')}}:
- deployment: PublishDocs
Expand Down Expand Up @@ -446,8 +444,6 @@ stages:
os: linux
variables:
- template: /eng/pipelines/templates/variables/globals.yml
- name: DocValidationImageId
value: azuresdkimages.azurecr.io/javarefautocr:latest
steps:
- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
parameters:
Expand All @@ -466,6 +462,8 @@ stages:

- template: /eng/pipelines/templates/steps/mvn-linux-repository-settings.yml

- template: /eng/pipelines/templates/steps/install-rex-validation-tool.yml

- template: /eng/common/pipelines/templates/steps/update-docsms-metadata.yml
parameters:
PackageInfoLocations:
Expand All @@ -480,6 +478,5 @@ stages:
SparseCheckoutPaths:
- docs-ref-services/
- metadata/
DocValidationImageId: "$(DocValidationImageId)"

- template: /eng/common/pipelines/templates/steps/docsms-ensure-validation.yml
22 changes: 22 additions & 0 deletions eng/pipelines/templates/steps/install-rex-validation-tool.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
steps:
# Create a java2docfx subdirectory in the $(Build.BinariesDirectory) and install the java2docfx there
# This way, the jar file is in its own subdirectory and isolated.
- pwsh: |
$java2docfxVer = Get-Content eng/scripts/docs/java2docfx.version.txt
$java2docfxDir = Join-Path $(Build.BinariesDirectory) "java2docfx"
New-Item $java2docfxDir -ItemType Directory | Out-Null
$originLocation = Get-Location
try {
# Set the location into the created java2docfx directory . Running mvn from the repository root
# picks up the root POM and processes that while doing the dependency:copy in spite of
# the fact it has nothing to do with this download.
Set-Location $java2docfxDir
Write-Host "mvn dependency:copy -Dartifact=""com.microsoft:java2docfx:$java2docfxVer"" -DoutputDirectory=""$java2docfxDir"""
mvn dependency:copy -Dartifact="com.microsoft:java2docfx:$java2docfxVer" -DoutputDirectory="$java2docfxDir"
$java2docfxJarLoc = Join-Path $java2docfxDir -ChildPath "java2docfx-$java2docfxVer.jar"
Write-Host "Testing the install, running java -jar $java2docfxJarLoc -h"
java -jar $java2docfxJarLoc -h
} finally {
Set-Location $originLocation
}
displayName: Install java2docfx for package validation
10 changes: 10 additions & 0 deletions eng/repo-docs/docms/daily.update.setting.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>docs-public-packages</id>
<url>https://docfx.pkgs.visualstudio.com/docfx/_packaging/docs-public-packages/maven/v1</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</profile>
</profiles>
Expand Down
Loading