DeterminateSystems/magic-nix-cache
1
1
Fork 0
mirror of https://github.com/DeterminateSystems/magic-nix-cache.git synced 2024-11-20 12:05:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility issues with alternative GHA cache implementation

Browse Source 
Fixes two compatibility issues with the alternative GHA cache server
implementation:

https://github.com/falcondev-oss/github-actions-cache-server

1. This implementation does not support redundant forward slashes
   in URL paths. The change allows magic-nix-cache to work properly
   regardless of whether ACTIONS_CACHE_URL ends in a forward slash or
   not.
2. The cache IDs returned by this implementation can be too big for
   an i32, so the representation of the CacheID type has been updated
   to an i64.

Signed-off-by: Cory Snyder <csnyder@1111systems.com>
This commit is contained in:
Cory Snyder 2024-09-20 05:01:13 -04:00
parent 955ed68d34
commit 4f25f7b3e6
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.
#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
#[serde(transparent)]
struct CacheId(pub i32);
struct CacheId(pub i64);
/// An API error.
#[derive(Debug, Clone)]
@ -543,10 +543,13 @@ impl Api {
}
fn construct_url(&self, resource: &str) -> String {
format!(
"{}/_apis/artifactcache/{}",
self.credentials.cache_url, resource
)
let mut url = self.credentials.cache_url.clone();
if !url.ends_with('/') {
url.push('/');
}
url.push_str("_apis/artifactcache/");
url.push_str(resource);
url
}
}