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
10 changes: 10 additions & 0 deletions src/compile/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,16 @@ pub const DEFAULT_POOL: &str = "AZS-1ES-L-MMS-ubuntu-22.04";
/// See: https://github.com/github/gh-aw-firewall/releases
pub const AWF_VERSION: &str = "0.23.1";

/// Version of the GitHub Copilot CLI (Microsoft.Copilot.CLI.linux-x64) NuGet package to install.
/// Update this when upgrading to a new Copilot CLI release.
/// See: https://pkgs.dev.azure.com/msazuresphere/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json
pub const COPILOT_CLI_VERSION: &str = "1.0.6";

/// Version of the Agency CLI (agency.linux-x64) NuGet package to install in 1ES pipelines.
/// Update this when upgrading to a new Agency CLI release.
/// See: https://pkgs.dev.azure.com/msazuresphere/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json
pub const AGENCY_CLI_VERSION: &str = "2026.1.22.4";

/// Generate source path for the execute command.
///
/// Returns a path using `{{ workspace }}` as the base, which gets resolved
Expand Down
3 changes: 2 additions & 1 deletion src/compile/onees.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use std::path::Path;

use super::Compiler;
use super::common::{
self, AWF_VERSION, DEFAULT_POOL, compute_effective_workspace, generate_copilot_params,
self, AGENCY_CLI_VERSION, AWF_VERSION, DEFAULT_POOL, compute_effective_workspace, generate_copilot_params,
generate_acquire_ado_token, generate_checkout_self, generate_checkout_steps,
generate_ci_trigger, generate_copilot_ado_env, generate_executor_ado_env,
generate_pipeline_path, generate_pipeline_resources, generate_pr_trigger,
Expand Down Expand Up @@ -139,6 +139,7 @@ displayName: "Finalize""#,
("{{ compiler_version }}", compiler_version),
// No-op for 1ES (template doesn't use AWF), but included for forward-compatibility
("{{ firewall_version }}", AWF_VERSION),
("{{ agency_version }}", AGENCY_CLI_VERSION),
("{{ pool }}", &pool),
("{{ schedule }}", &schedule),
("{{ pr_trigger }}", &pr_trigger),
Expand Down
3 changes: 2 additions & 1 deletion src/compile/standalone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use std::path::Path;

use super::Compiler;
use super::common::{
self, AWF_VERSION, DEFAULT_POOL, compute_effective_workspace, generate_copilot_params,
self, AWF_VERSION, COPILOT_CLI_VERSION, DEFAULT_POOL, compute_effective_workspace, generate_copilot_params,
generate_acquire_ado_token, generate_cancel_previous_builds, generate_checkout_self,
generate_checkout_steps, generate_ci_trigger, generate_copilot_ado_env,
generate_executor_ado_env, generate_pipeline_path, generate_pipeline_resources,
Expand Down Expand Up @@ -140,6 +140,7 @@ impl Compiler for StandaloneCompiler {
let replacements: Vec<(&str, &str)> = vec![
("{{ compiler_version }}", compiler_version),
("{{ firewall_version }}", AWF_VERSION),
("{{ copilot_version }}", COPILOT_CLI_VERSION),
("{{ pool }}", &pool),
("{{ setup_job }}", &setup_job),
("{{ teardown_job }}", &teardown_job),
Expand Down
2 changes: 1 addition & 1 deletion templates/1es-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ extends:
displayName: "Install Agency CLI"
inputs:
command: 'custom'
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'
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'

- bash: |
ls -la "$(Agent.TempDirectory)/tools"
Expand Down
4 changes: 2 additions & 2 deletions templates/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
displayName: "Install Copilot CLI"
inputs:
command: 'custom'
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'
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'

- bash: |
ls -la "$(Agent.TempDirectory)/tools"
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
displayName: "Install Copilot CLI"
inputs:
command: 'custom'
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'
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'

- bash: |
ls -la "$(Agent.TempDirectory)/tools"
Expand Down
Loading