Fix save path of bcsymbolmap in local cache

tmspzz · Jan 23, 2018 · 0d59396 · 0d59396
1 parent b4dbcb7
commit 0d59396
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Rome.cabal b/Rome.cabal
@@ -1,5 +1,5 @@
 name:                Rome
-version:             0.14.0.38
+version:             0.14.1.38
 synopsis:            An S3 cache for Carthage
 description:         Please see README.md
 homepage:            https://github.com/blender/Rome

diff --git a/app/Main.hs b/app/Main.hs
@@ -10,7 +10,7 @@ import           System.Exit
 
 
 romeVersion :: RomeVersion
-romeVersion = (0, 14, 0, 38)
+romeVersion = (0, 14, 1, 38)
 
 
 

diff --git a/src/Lib.hs b/src/Lib.hs
@@ -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)
@@ -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
 
@@ -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
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, 38)



Expand Down