Another attempt at the cache key

dotnet · Jan 1, 2024 · 1e2552a · 1e2552a
1 parent 0033ce6
commit 1e2552a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/sources/SilkTouch/Clang/ResponseFileHandler.cs b/sources/SilkTouch/Clang/ResponseFileHandler.cs
@@ -1480,7 +1480,8 @@ out Dictionary<string, string> withPackings
             fileDirectory,
             clangCommandLineArgs,
             translationFlags,
-            XxHash64.HashToUInt64(Encoding.UTF8.GetBytes(string.Join('\n', args)))
+            XxHash64.HashToUInt64(Encoding.UTF8.GetBytes(string.Join('\n',
+                args.Select(x => x.Trim().ToLower().Replace('\\', '/')).Where(x => x.Length > 0))))
         );
     }
 

diff --git a/sources/SilkTouch/SilkTouchGenerator.cs b/sources/SilkTouch/SilkTouchGenerator.cs
@@ -127,7 +127,8 @@ public async Task<GeneratedSyntax> GenerateSyntaxAsync(
                 jobConfig
                     .AsEnumerable()
                     .Where(x => x.Key.StartsWith($"Jobs:{key}", StringComparison.OrdinalIgnoreCase))
-            ) + string.Join(',', rsps.Select(x => x.FileHash))
+                    .OrderBy(x => x.Key)
+            ) + string.Join(',', rsps.Order().Select(x => x.FileHash))
         )
             .Replace('\\', '/')
             .ToLower();