Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 18 additions & 1 deletion eng/pipelines/docindex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,15 @@ jobs:
ContainerRegistryClientId: $(azuresdkimages-cr-clientid)
ContainerRegistryClientSecret: $(azuresdkimages-cr-clientsecret)
ImageId: "$(DocValidationImageId)"
# Call update docs ci script to onboard packages

- task: Powershell@2
inputs:
pwsh: true
filePath: eng/common/scripts/Update-DocsMsPackageMonikers.ps1
arguments: -DocRepoLocation $(DocRepoLocation)
displayName: Move deprecated packages to legacy moniker
condition: and(succeeded(), or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Force.MainUpdate'], 'true')))

- task: Powershell@2
inputs:
pwsh: true
Expand Down Expand Up @@ -116,6 +124,15 @@ jobs:
Copy-Item "./eng/repo-docs/docms/daily.update.setting.xml" -Destination "~/.m2/settings.xml"
displayName: 'Configure mvn'
workingDirectory: $(Build.SourcesDirectory)

- task: Powershell@2
inputs:
pwsh: true
filePath: eng/common/scripts/Update-DocsMsPackageMonikers.ps1
arguments: -DocRepoLocation $(DocRepoLocation)
displayName: Move deprecated packages to legacy moniker
condition: and(succeeded(), or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Force.MainUpdate'], 'true')))

- task: Powershell@2
inputs:
pwsh: true
Expand Down
1 change: 1 addition & 0 deletions eng/scripts/Language-Settings.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,7 @@ function Get-java-DocsMsMetadataForPackage($PackageInfo) {
DocsMsReadMeName = $readmeName
LatestReadMeLocation = 'docs-ref-services/latest'
PreviewReadMeLocation = 'docs-ref-services/preview'
LegacyReadMeLocation = 'docs-ref-services/legacy'
Suffix = ''
}
}
Expand Down
13 changes: 6 additions & 7 deletions eng/scripts/docs/Docs-Onboarding.ps1
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
#$SetDocsPackageOnboarding = "Set-${Language}-DocsPackageOnboarding"
function Set-java-DocsPackageOnboarding($moniker, $metadata, $docRepoLocation, $packageSourceOverride) {

# Do not write onboarding information for legacy moniker
# TODO: remove this once legacy moniker is properly configured
if ($moniker -eq 'legacy') {
return
}

$packageJsonPath = Join-Path $docRepoLocation "package.json"
$onboardingInfo = Get-Content $packageJsonPath | ConvertFrom-Json

Expand Down Expand Up @@ -64,3 +57,9 @@ function Get-java-DocsPackagesAlreadyOnboarded($docRepoLocation, $moniker) {
function Get-java-PackageIdentity($package) {
return "$($package['Group']):$($package['Name'])"
}

# Declared in common.ps1 as
# $GetPackageIdentityFromCsvMetadata = "Get-${Language}-PackageIdentityFromCsvMetadata"
function Get-java-PackageIdentityFromCsvMetadata($package) {
return "$($package.GroupId):$($Package.Package)"
}
7 changes: 3 additions & 4 deletions eng/scripts/docs/Docs-ToC.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ function Get-java-OnboardedDocsMsPackagesForMoniker ($DocRepoLocation, $moniker)
$onboardingSpec = ConvertFrom-Json (Get-Content $packageOnboardingFiles -Raw)
if ("preview" -eq $moniker) {
$onboardingSpec = $onboardingSpec | Where-Object { $_.output_path -eq "preview/docs-ref-autogen" }
}
elseif("latest" -eq $moniker) {
} elseif("latest" -eq $moniker) {
$onboardingSpec = $onboardingSpec | Where-Object { $_.output_path -eq "docs-ref-autogen" }
} elseif ("legacy" -eq $moniker) {
$onboardingSpec = $onboardingSpec | Where-Object { $_.output_path -eq "legacy/docs-ref-autogen" }
}

# TODO: Add support for "legacy" moniker

$onboardedPackages = @{}
foreach ($spec in $onboardingSpec.packages) {
$packageName = $spec.packageArtifactId
Expand Down