Skip to content

Update Kubernetes tasks to use latest dependencies #21878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ivanduplenskikh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Kubernetes tasks to use latest dependencies #21878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions BuildConfigGen/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,12 @@ internal static class Config
public static readonly Dictionary<string, string> Node24PackageOverrides = new Dictionary<string, string>
{
["typescript"] = "^5.7.2",
["azure-pipelines-task-lib"] = "^5.2.4",
["azure-pipelines-task-lib"] = "^5.2.6",
["azure-devops-node-api"] = "^15.1.3",
["azure-pipelines-tasks-artifacts-common"] = "^2.270.0",
["azure-pipelines-tasks-azure-arm-rest"] = "^3.271.1",
["azure-pipelines-tasks-azurermdeploycommon"] = "^3.270.0",
["azure-pipelines-tasks-kubernetes-common"] = "^2.270.1",
["azure-pipelines-tasks-packaging-common"] = "^3.270.0",
["azure-pipelines-tasks-securefiles-common"] = "^2.270.0",
["azure-pipelines-tasks-utility-common"] = "^3.270.0",
Expand Down Expand Up @@ -222,7 +223,7 @@ private static void MainInner(

Console.WriteLine($"Current sprint: {currentSprint}");

if (bumpBaseTask)
if (bumpBaseTask)
{
// Split the task string and bump each task individually
var taskList = task!.Split(',', '|');
Expand Down Expand Up @@ -673,7 +674,7 @@ private static void MainUpdateTask(

if (targetConfigs.Any(x => x.isNode))
{
// Task may not have nodejs or packages.json (example: AutomatedAnalysisV0)
// Task may not have nodejs or packages.json (example: AutomatedAnalysisV0)
if (!HasNodeHandler(taskHandlerContents))
{
Console.WriteLine($"Skipping {task} because task doesn't have node handler does not exist");
Expand Down Expand Up @@ -798,7 +799,7 @@ private static void MainUpdateTask(
{
throw new Exception($"There is no default config for task {task}");
}

WriteTaskJson(taskOutput, taskVersionState, config, "task.json", existingLocalPackageVersion, useSemverBuildConfig: true, defaultConfig: defaultConfig);
WriteTaskJson(taskOutput, taskVersionState, config, "task.loc.json", existingLocalPackageVersion, useSemverBuildConfig: true, defaultConfig: defaultConfig);
}
Expand Down Expand Up @@ -1135,7 +1136,7 @@ private static void PreprocessIfExtensionEnabledInConfig(string file, Config.Con

/// <summary>
/// Writes task.json with version information and build config mapping.
/// When useSemverBuildConfig is true, uses the same major.minor.patch for all build configuration tasks,
/// When useSemverBuildConfig is true, uses the same major.minor.patch for all build configuration tasks,
/// but the "build" suffix of semver is different and directly corresponds to the config name.
/// </summary>
private static void WriteTaskJson(string taskPath, TaskStateStruct taskState, Config.ConfigRecord config, string fileName, string? existingLocalPackageVersion, bool useSemverBuildConfig = false, Config.ConfigRecord? defaultConfig = null)
Expand Down Expand Up @@ -1686,7 +1687,7 @@ private static void UpdateVersionsGlobal(string task, TaskStateStruct taskState,
if (config.useGlobalVersion)
{
TaskVersion versionToUse = globalVersion;

if (config.abTaskReleases && useSemverBuildConfig)
{
// In the first stage of refactoring, we keep different version numbers to retain the ability to rollback.
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureCLIV1/_buildConfigs/Node24/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Tasks/AzureCLIV1/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"demands": [],
"version": {
"Major": 1,
"Minor": 270,
"Patch": 3
"Minor": 272,
"Patch": 0
},
"minimumAgentVersion": "2.0.0",
"instanceNameFormat": "Azure CLI $(scriptPath)",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureCLIV1/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"demands": [],
"version": {
"Major": 1,
"Minor": 270,
"Patch": 3
"Minor": 272,
"Patch": 0
},
"minimumAgentVersion": "2.0.0",
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureCLIV2/_buildConfigs/Node24/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/AzureCLIV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"demands": [],
"version": {
"Major": 2,
"Minor": 271,
"Minor": 272,
"Patch": 0
},
"minimumAgentVersion": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureCLIV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"demands": [],
"version": {
"Major": 2,
"Minor": 271,
"Minor": 272,
"Patch": 0
},
"minimumAgentVersion": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureCLIV3/_buildConfigs/Node24/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/AzureCLIV3/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"demands": [],
"version": {
"Major": 3,
"Minor": 271,
"Minor": 272,
"Patch": 0
},
"minimumAgentVersion": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureCLIV3/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"demands": [],
"version": {
"Major": 3,
"Minor": 271,
"Minor": 272,
"Patch": 0
},
"minimumAgentVersion": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV4/_buildConfigs/Node24/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV4/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 4,
"Minor": 272,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV4/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 4,
"Minor": 272,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV5/_buildConfigs/Node24/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV5/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 5,
"Minor": 272,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV5/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 5,
"Minor": 272,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV6/_buildConfigs/Node24/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV6/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 6,
"Minor": 272,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV6/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 6,
"Minor": 272,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
Loading