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

Merge pull request #105 from cfsnyder/main

Browse source 
Fix compatibility issues with alternative GHA cache implementation
This commit is contained in:
Graham Christensen 2024-09-25 15:17:09 -04:00 committed by GitHub
parent 24af143b67 4f25f7b3e6
commit 6a5abbf3bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gha-cache/src/api.rs
View file

@ -116,7 +116,7 @@ pub struct FileAllocation(CacheId);
/// The ID of a cache. /// The ID of a cache.
#[derive(Debug, Clone, Copy, Serialize, Deserialize)] #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
#[serde(transparent)] #[serde(transparent)]
struct CacheId(pub i32); struct CacheId(pub i64);
/// An API error. /// An API error.
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -543,10 +543,13 @@ impl Api {
} }
fn construct_url(&self, resource: &str) -> String { fn construct_url(&self, resource: &str) -> String {
format!( let mut url = self.credentials.cache_url.clone();
"{}/_apis/artifactcache/{}", if !url.ends_with('/') {
self.credentials.cache_url, resource url.push('/');
) }
url.push_str("_apis/artifactcache/");
url.push_str(resource);
url
} }
} }