globby 2

Author: Beyley

build/nuke/Build.Native.cs

@@ -421,9 +421,25 @@ string AndroidHome
                        //Copy the linux binaries
                        CopyAll(@out.GlobFiles("dxvk-native-master/usr/lib/*"), runtimes / "linux-x64" / "native");
                        CopyAll(@out.GlobFiles("dxvk-native-master/usr/lib32/*"), runtimes / "linux-x86" / "native");
-                                             
-                       PrUpdatedNativeBinary("DXVK", OSPlatform.Linux);
-                       PrUpdatedNativeBinary("DXVK", OSPlatform.Windows);
+
+                       var winx64 = runtimes / "win-x64" / "native";
+                       var winx86 = runtimes / "win-x86" / "native";
+                       
+                       var linuxx64 = runtimes / "linux-x64" / "native";
+                       var linuxx86 = runtimes / "linux-x86" / "native";
+
+                       var glob = string.Empty;
+                       var files = winx64.GlobFiles("*.dll")
+                                         .Concat(winx86.GlobFiles("*.dll"))
+                                         .Concat(linuxx64.GlobFiles("*.so"))
+                                         .Concat(linuxx86.GlobFiles("*.so"));
+
+                       glob = files.Aggregate(glob, (current, path) => current + $"\"{path}\" ");
+
+                       PrUpdatedNativeBinary
+                       (
+                           "DXVK", glob
+                       );
                    }
                )
     );
@@ -498,7 +514,7 @@ void CopyAs(AbsolutePath @out, string from, string to)
             )
     );
 
-    void PrUpdatedNativeBinary(string name, OSPlatform? platform = null)
+    void PrUpdatedNativeBinary(string name, [CanBeNull] string glob = null)
     {
         var pushableToken = EnvironmentInfo.GetVariable<string>("PUSHABLE_GITHUB_TOKEN");
         var curBranch = GitCurrentBranch(RootDirectory);
@@ -511,19 +527,19 @@ void PrUpdatedNativeBinary(string name, OSPlatform? platform = null)
             !curBranch.StartsWith("develop/", StringComparison.OrdinalIgnoreCase))
         {
             // it's assumed that the pushable token was used to checkout the repo
-            var suffix = string.Empty;
+            var suffix = glob;
 
-            if ((platform == OSPlatform.Windows) || (!platform.HasValue && OperatingSystem.IsWindows()))
+            if (OperatingSystem.IsWindows())
             {
-                suffix = "/**/*.dll";
+                suffix ??= "/**/*.dll";
             }
-            else if ((platform == OSPlatform.OSX) || (!platform.HasValue && OperatingSystem.IsMacOS()))
+            else if (OperatingSystem.IsMacOS())
             {
-                suffix = "/**/*.dylib";
+                suffix ??= "/**/*.dylib";
             }
-            else if ((platform == OSPlatform.Linux) || (!platform.HasValue && OperatingSystem.IsLinux()))
+            else if (OperatingSystem.IsLinux())
             {
-                suffix = "/**/*.so*";
+                suffix ??= "/**/*.so*";
             }
 
             Git("fetch --all", RootDirectory);