Skip to content

Commit 69d2fd0

Browse files
Update Kubernetes tasks to use latest dependencies and bump version numbers
1 parent f247b1a commit 69d2fd0

File tree

69 files changed

+417
-759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+417
-759
lines changed

BuildConfigGen/Program.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ internal static class Config
4949
public static readonly Dictionary<string, string> Node24PackageOverrides = new Dictionary<string, string>
5050
{
5151
["typescript"] = "^5.7.2",
52-
["azure-pipelines-task-lib"] = "^5.2.4",
52+
["azure-pipelines-task-lib"] = "^5.2.6",
5353
["azure-devops-node-api"] = "^15.1.3",
5454
["azure-pipelines-tasks-artifacts-common"] = "^2.270.0",
5555
["azure-pipelines-tasks-azure-arm-rest"] = "^3.270.0",
@@ -222,7 +222,7 @@ private static void MainInner(
222222

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

225-
if (bumpBaseTask)
225+
if (bumpBaseTask)
226226
{
227227
// Split the task string and bump each task individually
228228
var taskList = task!.Split(',', '|');
@@ -673,7 +673,7 @@ private static void MainUpdateTask(
673673

674674
if (targetConfigs.Any(x => x.isNode))
675675
{
676-
// Task may not have nodejs or packages.json (example: AutomatedAnalysisV0)
676+
// Task may not have nodejs or packages.json (example: AutomatedAnalysisV0)
677677
if (!HasNodeHandler(taskHandlerContents))
678678
{
679679
Console.WriteLine($"Skipping {task} because task doesn't have node handler does not exist");
@@ -798,7 +798,7 @@ private static void MainUpdateTask(
798798
{
799799
throw new Exception($"There is no default config for task {task}");
800800
}
801-
801+
802802
WriteTaskJson(taskOutput, taskVersionState, config, "task.json", existingLocalPackageVersion, useSemverBuildConfig: true, defaultConfig: defaultConfig);
803803
WriteTaskJson(taskOutput, taskVersionState, config, "task.loc.json", existingLocalPackageVersion, useSemverBuildConfig: true, defaultConfig: defaultConfig);
804804
}
@@ -1135,7 +1135,7 @@ private static void PreprocessIfExtensionEnabledInConfig(string file, Config.Con
11351135

11361136
/// <summary>
11371137
/// Writes task.json with version information and build config mapping.
1138-
/// When useSemverBuildConfig is true, uses the same major.minor.patch for all build configuration tasks,
1138+
/// When useSemverBuildConfig is true, uses the same major.minor.patch for all build configuration tasks,
11391139
/// but the "build" suffix of semver is different and directly corresponds to the config name.
11401140
/// </summary>
11411141
private static void WriteTaskJson(string taskPath, TaskStateStruct taskState, Config.ConfigRecord config, string fileName, string? existingLocalPackageVersion, bool useSemverBuildConfig = false, Config.ConfigRecord? defaultConfig = null)
@@ -1263,6 +1263,8 @@ private static void WriteNodePackageJson(string taskOutputNode, string nodeVersi
12631263
UpdateDependencyIfExists(outputNodePackagePathJsonNode, kvp.Key, kvp.Value);
12641264
}
12651265

1266+
UpdateDependencyIfExists(outputNodePackagePathJsonNode, "azure-pipelines-tasks-kubernetes-common", "npm:azure-pipelines-tasks-k8s-common@^2.270.1");
1267+
12661268
// We need to add newline since npm install command always add newline at the end of package.json
12671269
// https://github.com/npm/npm/issues/18545
12681270
string nodePackageContent = outputNodePackagePathJsonNode.ToJsonString(jso) + Environment.NewLine;
@@ -1686,7 +1688,7 @@ private static void UpdateVersionsGlobal(string task, TaskStateStruct taskState,
16861688
if (config.useGlobalVersion)
16871689
{
16881690
TaskVersion versionToUse = globalVersion;
1689-
1691+
16901692
if (config.abTaskReleases && useSemverBuildConfig)
16911693
{
16921694
// In the first stage of refactoring, we keep different version numbers to retain the ability to rollback.

Tasks/AzureCLIV1/_buildConfigs/Node24/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/AzureCLIV1/task.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"demands": [],
2020
"version": {
2121
"Major": 1,
22-
"Minor": 270,
23-
"Patch": 3
22+
"Minor": 271,
23+
"Patch": 0
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "Azure CLI $(scriptPath)",

Tasks/AzureCLIV1/task.loc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"demands": [],
2020
"version": {
2121
"Major": 1,
22-
"Minor": 270,
23-
"Patch": 3
22+
"Minor": 271,
23+
"Patch": 0
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tasks/AzureCLIV2/_buildConfigs/Node24/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/AzureCLIV2/task.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"demands": [],
2020
"version": {
2121
"Major": 2,
22-
"Minor": 270,
23-
"Patch": 3
22+
"Minor": 271,
23+
"Patch": 0
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "Azure CLI $(scriptPath)",

Tasks/AzureCLIV2/task.loc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"demands": [],
2020
"version": {
2121
"Major": 2,
22-
"Minor": 270,
23-
"Patch": 3
22+
"Minor": 271,
23+
"Patch": 0
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

Tasks/AzureCLIV3/_buildConfigs/Node24/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/AzureCLIV3/task.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"demands": [],
2020
"version": {
2121
"Major": 3,
22-
"Minor": 270,
23-
"Patch": 4
22+
"Minor": 271,
23+
"Patch": 0
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "Azure CLI $(scriptPath)",

Tasks/AzureCLIV3/task.loc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"demands": [],
2020
"version": {
2121
"Major": 3,
22-
"Minor": 270,
23-
"Patch": 4
22+
"Minor": 271,
23+
"Patch": 0
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

0 commit comments

Comments
 (0)