Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix save path of bcsymbolmap in local cache #115

Merged
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
2 changes: 1 addition & 1 deletion Rome.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Rome
version: 0.14.0.38
version: 0.14.1.39
synopsis: An S3 cache for Carthage
description: Please see README.md
homepage: https://github.com/blender/Rome
Expand Down
2 changes: 1 addition & 1 deletion app/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import System.Exit


romeVersion :: RomeVersion
romeVersion = (0, 14, 0, 38)
romeVersion = (0, 14, 1, 39)



Expand Down
13 changes: 7 additions & 6 deletions src/Lib.hs
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ saveBcsymbolmapToLocalCache lCacheDir
platform = do
(CachePrefix prefix, SkipLocalCacheFlag skipLocalCache, verbose) <- ask
unless skipLocalCache $
saveBinaryToLocalCache lCacheDir
saveBinaryToLocalCache lCacheDir
(Zip.fromArchive dwarfArchive)
(prefix </> remoteBcSymbolmapUploadPath)
(bcsymbolmapNameFrom dwarfUUID)
Expand Down Expand Up @@ -972,13 +972,13 @@ downloadFrameworkAndArtifactsFromCaches s3BucketName
liftIO $ runReaderT
( do
e <- runExceptT $ do
let symbolmapName = fwn <> "." <> bcsymbolmapNameFrom dwarfUUID
let symbolmapLoggingName = fwn <> "." <> bcsymbolmapNameFrom dwarfUUID
let bcsymbolmapZipName d = bcsymbolmapArchiveName d version
let bcsybolmapPath d = platformBuildDirectory </> bcsymbolmapNameFrom d
let localBcsybolmapPathFrom d = platformBuildDirectory </> bcsymbolmapNameFrom d
symbolmapBinary <- getBcsymbolmapFromS3 s3BucketName reverseRomeMap fVersion platform dwarfUUID
saveBinaryToLocalCache lCacheDir symbolmapBinary (prefix </> remoteFrameworkUploadPath) fwn verbose
deleteFile (bcsybolmapPath dwarfUUID) verbose
unzipBinary symbolmapBinary symbolmapName (bcsymbolmapZipName dwarfUUID) verbose
saveBinaryToLocalCache lCacheDir symbolmapBinary (prefix </> remoteBcSymbolmapUploadPathFromDwarf dwarfUUID) fwn verbose
deleteFile (localBcsybolmapPathFrom dwarfUUID) verbose
unzipBinary symbolmapBinary symbolmapLoggingName (bcsymbolmapZipName dwarfUUID) verbose
whenLeft sayFunc e
) remoteReaderEnv

Expand All @@ -1002,6 +1002,7 @@ downloadFrameworkAndArtifactsFromCaches s3BucketName
where
frameworkZipName = frameworkArchiveName f version
remoteFrameworkUploadPath = remoteFrameworkPath platform reverseRomeMap f version
remoteBcSymbolmapUploadPathFromDwarf dwarfUUID = remoteBcsymbolmapPath dwarfUUID platform reverseRomeMap f version
dSYMZipName = dSYMArchiveName f version
remotedSYMUploadPath = remoteDsymPath platform reverseRomeMap f version
platformBuildDirectory = carthageBuildDirectoryForPlatform platform
Expand Down