Skip to content

Commit b8d8ece

Browse files
authored
fix: update Copilot CLI version to 1.0.6 via compiler constants (#51)
1 parent 26c03c4 commit b8d8ece

5 files changed

Lines changed: 17 additions & 5 deletions

File tree

src/compile/common.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,16 @@ pub const DEFAULT_POOL: &str = "AZS-1ES-L-MMS-ubuntu-22.04";
460460
/// See: https://github.com/github/gh-aw-firewall/releases
461461
pub const AWF_VERSION: &str = "0.23.1";
462462

463+
/// Version of the GitHub Copilot CLI (Microsoft.Copilot.CLI.linux-x64) NuGet package to install.
464+
/// Update this when upgrading to a new Copilot CLI release.
465+
/// See: https://pkgs.dev.azure.com/msazuresphere/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json
466+
pub const COPILOT_CLI_VERSION: &str = "1.0.6";
467+
468+
/// Version of the Agency CLI (agency.linux-x64) NuGet package to install in 1ES pipelines.
469+
/// Update this when upgrading to a new Agency CLI release.
470+
/// See: https://pkgs.dev.azure.com/msazuresphere/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json
471+
pub const AGENCY_CLI_VERSION: &str = "2026.1.22.4";
472+
463473
/// Generate source path for the execute command.
464474
///
465475
/// Returns a path using `{{ workspace }}` as the base, which gets resolved

src/compile/onees.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use std::path::Path;
1717

1818
use super::Compiler;
1919
use super::common::{
20-
self, AWF_VERSION, DEFAULT_POOL, compute_effective_workspace, generate_copilot_params,
20+
self, AGENCY_CLI_VERSION, AWF_VERSION, DEFAULT_POOL, compute_effective_workspace, generate_copilot_params,
2121
generate_acquire_ado_token, generate_checkout_self, generate_checkout_steps,
2222
generate_ci_trigger, generate_copilot_ado_env, generate_executor_ado_env,
2323
generate_pipeline_path, generate_pipeline_resources, generate_pr_trigger,
@@ -139,6 +139,7 @@ displayName: "Finalize""#,
139139
("{{ compiler_version }}", compiler_version),
140140
// No-op for 1ES (template doesn't use AWF), but included for forward-compatibility
141141
("{{ firewall_version }}", AWF_VERSION),
142+
("{{ agency_version }}", AGENCY_CLI_VERSION),
142143
("{{ pool }}", &pool),
143144
("{{ schedule }}", &schedule),
144145
("{{ pr_trigger }}", &pr_trigger),

src/compile/standalone.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::path::Path;
1414

1515
use super::Compiler;
1616
use super::common::{
17-
self, AWF_VERSION, DEFAULT_POOL, compute_effective_workspace, generate_copilot_params,
17+
self, AWF_VERSION, COPILOT_CLI_VERSION, DEFAULT_POOL, compute_effective_workspace, generate_copilot_params,
1818
generate_acquire_ado_token, generate_cancel_previous_builds, generate_checkout_self,
1919
generate_checkout_steps, generate_ci_trigger, generate_copilot_ado_env,
2020
generate_executor_ado_env, generate_pipeline_path, generate_pipeline_resources,
@@ -140,6 +140,7 @@ impl Compiler for StandaloneCompiler {
140140
let replacements: Vec<(&str, &str)> = vec![
141141
("{{ compiler_version }}", compiler_version),
142142
("{{ firewall_version }}", AWF_VERSION),
143+
("{{ copilot_version }}", COPILOT_CLI_VERSION),
143144
("{{ pool }}", &pool),
144145
("{{ setup_job }}", &setup_job),
145146
("{{ teardown_job }}", &teardown_job),

templates/1es-base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ extends:
162162
displayName: "Install Agency CLI"
163163
inputs:
164164
command: 'custom'
165-
arguments: 'install agency.linux-x64 -Source "https://pkgs.dev.azure.com/msazuresphere/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json" -Version 2026.1.22.4 -OutputDirectory $(Agent.TempDirectory)/tools -ExcludeVersion -NonInteractive'
165+
arguments: 'install agency.linux-x64 -Source "https://pkgs.dev.azure.com/msazuresphere/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json" -Version {{ agency_version }} -OutputDirectory $(Agent.TempDirectory)/tools -ExcludeVersion -NonInteractive'
166166

167167
- bash: |
168168
ls -la "$(Agent.TempDirectory)/tools"

templates/base.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
displayName: "Install Copilot CLI"
3535
inputs:
3636
command: 'custom'
37-
arguments: 'install Microsoft.Copilot.CLI.linux-x64 -Source "https://pkgs.dev.azure.com/msazuresphere/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json" -Version 0.0.407 -OutputDirectory $(Agent.TempDirectory)/tools -ExcludeVersion -NonInteractive'
37+
arguments: 'install Microsoft.Copilot.CLI.linux-x64 -Source "https://pkgs.dev.azure.com/msazuresphere/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json" -Version {{ copilot_version }} -OutputDirectory $(Agent.TempDirectory)/tools -ExcludeVersion -NonInteractive'
3838

3939
- bash: |
4040
ls -la "$(Agent.TempDirectory)/tools"
@@ -295,7 +295,7 @@ jobs:
295295
displayName: "Install Copilot CLI"
296296
inputs:
297297
command: 'custom'
298-
arguments: 'install Microsoft.Copilot.CLI.linux-x64 -Source "https://pkgs.dev.azure.com/msazuresphere/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json" -Version 0.0.407 -OutputDirectory $(Agent.TempDirectory)/tools -ExcludeVersion -NonInteractive'
298+
arguments: 'install Microsoft.Copilot.CLI.linux-x64 -Source "https://pkgs.dev.azure.com/msazuresphere/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json" -Version {{ copilot_version }} -OutputDirectory $(Agent.TempDirectory)/tools -ExcludeVersion -NonInteractive'
299299

300300
- bash: |
301301
ls -la "$(Agent.TempDirectory)/tools"

0 commit comments

Comments
 (0)