mirrors/magic-nix-cache
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Switch the GHA Caceh preference to a trinary, but treat it as a straight bool for the moment

Browse source
This commit is contained in:
Graham Christensen 2024-11-05 21:19:18 -05:00
parent 3fd6eeb208
commit 65060bc705
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
magic-nix-cache/src/flakehub.rs
View file

@ -33,7 +33,7 @@ pub async fn init_cache(
environment: Environment, environment: Environment,
flakehub_api_server: &Url, flakehub_api_server: &Url,
flakehub_cache_server: &Url, flakehub_cache_server: &Url,
flakehub_flake_name: Option<String>, flakehub_flake_name: &Option<String>,
store: Arc<NixStore>, store: Arc<NixStore>,
auth_method: &super::FlakeHubAuthSource, auth_method: &super::FlakeHubAuthSource,
) -> Result<State> { ) -> Result<State> {

16
magic-nix-cache/src/main.rs
View file

@ -110,7 +110,7 @@ struct Args {
/// Whether to use the GHA cache. /// Whether to use the GHA cache.
#[arg(long)] #[arg(long)]
use_gha_cache: bool, use_gha_cache: Option<Option<CacheTrinary>>,
/// Whether to use the FlakeHub binary cache. /// Whether to use the FlakeHub binary cache.
#[arg(long)] #[arg(long)]
@ -164,7 +164,7 @@ impl From<bool> for Dnixd {
impl Args { impl Args {
fn validate(&self, environment: env::Environment) -> Result<(), error::Error> { fn validate(&self, environment: env::Environment) -> Result<(), error::Error> {
if environment.is_gitlab_ci() && self.use_gha_cache { if environment.is_gitlab_ci() && self.github_cache_preference() == CacheTrinary::Enabled {
return Err(error::Error::Config(String::from( return Err(error::Error::Config(String::from(
"the --use-gha-cache flag should not be applied in GitLab CI", "the --use-gha-cache flag should not be applied in GitLab CI",
))); )));
@ -179,6 +179,10 @@ impl Args {
Ok(()) Ok(())
} }
fn github_cache_preference(&self) -> CacheTrinary {
self.use_gha_cache.into()
}
fn flakehub_preference(&self) -> CacheTrinary { fn flakehub_preference(&self) -> CacheTrinary {
self.use_flakehub.into() self.use_flakehub.into()
} }
@ -320,16 +324,16 @@ async fn main_cli() -> Result<()> {
}; };
let flakehub_state = if let Some(auth_method) = flakehub_auth_method { let flakehub_state = if let Some(auth_method) = flakehub_auth_method {
let flakehub_cache_server = args.flakehub_cache_server; let flakehub_cache_server = &args.flakehub_cache_server;
let flakehub_api_server = &args.flakehub_api_server; let flakehub_api_server = &args.flakehub_api_server;
let flakehub_flake_name = args.flakehub_flake_name; let flakehub_flake_name = &args.flakehub_flake_name;
match flakehub::init_cache( match flakehub::init_cache(
environment, environment,
flakehub_api_server, flakehub_api_server,
&flakehub_cache_server, flakehub_cache_server,
flakehub_flake_name, flakehub_flake_name,
store.clone(), store.clone(),
&auth_method, &auth_method,
@ -363,7 +367,7 @@ async fn main_cli() -> Result<()> {
None None
}; };
let gha_cache = if args.use_gha_cache { let gha_cache = if args.github_cache_preference() != CacheTrinary::Disabled {
tracing::info!("Loading credentials from environment"); tracing::info!("Loading credentials from environment");
let credentials = Credentials::load_from_env() let credentials = Credentials::load_from_env()