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
2 changes: 1 addition & 1 deletion AISKU/scripts/publishAzReleaseToCdn.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
# Publish to release type folder folder
PublishFiles $releaseFiles "$($version.type)" $cacheControl1Year $contentType $overwrite
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
# Publish to release nightly folder folder
PublishFiles $releaseFiles "nightly" $cacheControl1Year $contentType $overwrite
}
Expand Down
2 changes: 1 addition & 1 deletion AISKU/scripts/setAzActiveCdnVersion.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Function Validate-Params
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
if ("nightly" -ne $container) {
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
# Publish to release type folder folder
PublishFiles $releaseFiles "$($version.type)/ext" $cacheControl1Year $contentType $overwrite
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
# Publish to release nightly folder folder
PublishFiles $releaseFiles "nightly/ext" $cacheControl1Year $contentType $overwrite
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Function Validate-Params
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
if ("nightly" -ne $container) {
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
# Publish to release type folder folder
PublishFiles $releaseFiles "$($version.type)/ext" $cacheControl1Year $contentType $overwrite
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
# Publish to release nightly folder folder
PublishFiles $releaseFiles "nightly/ext" $cacheControl1Year $contentType $overwrite
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Function Validate-Params
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
if ("nightly" -ne $container) {
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
# Publish to release type folder folder
PublishFiles $releaseFiles "$($version.type)/ext" $cacheControl1Year $contentType $overwrite
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
# Publish to release nightly folder folder
PublishFiles $releaseFiles "nightly/ext" $cacheControl1Year $contentType $overwrite
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Function Validate-Params
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
if ("nightly" -ne $container) {
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
# Publish to release type folder folder
PublishFiles $releaseFiles "$($version.type)/tools" $cacheControl1Year $contentType $overwrite
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
# Publish to release nightly folder folder
PublishFiles $releaseFiles "nightly/tools" $cacheControl1Year $contentType $overwrite
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Function Validate-Params
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
if ("nightly" -ne $container) {
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
Expand Down
2 changes: 1 addition & 1 deletion tools/config/scripts/publishAzReleaseToCdn.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ elseif ($version.type -eq "dev" -or $version.type -eq "beta") {
# PublishFiles $releaseFiles "$($version.type)" $cacheControl1Year $contentType $overwrite
PublishFiles $testFiles "$($version.type)" $cacheControl1Year $contentType $overwrite
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
# Publish to release nightly folder folder
# PublishFiles $releaseFiles "nightly" $cacheControl1Year $contentType $overwrite
PublishFiles $testFiles "nightly" $cacheControl1Year $contentType $overwrite
Expand Down
2 changes: 1 addition & 1 deletion tools/config/scripts/setAzActiveCdnVersion.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Function Validate-Params
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
}
elseif ($version.type -eq "nightly" -or $version.type -eq "nightly3") {
elseif ($version.type -like "nightly*") {
if ("nightly" -ne $container) {
Write-LogFailure "Container [$container] is not valid for version type [$($version.type)]"
}
Expand Down
2 changes: 1 addition & 1 deletion tools/release-tools/setVersion.js
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ function updatePublishConfig(package, newVersion) {
}

// Set the publishing tag
if (details.type === "nightly" || details.type === "dev" || details.type === "beta" || details.type === "alpha") {
if (details.type === "nightly" || details.type === "nightlybeta" || details.type === "dev" || details.type === "beta" || details.type === "alpha") {
console.log(` Type - [${details.type}] - ${majorVersion}`);
package.publishConfig.tag = details.type + (majorVersion !== "0" ? majorVersion : "");
} else {
Expand Down
Loading