Merge branch 'hotfix/build-sdl-aar-in-ci' into ci/hotfix/build-sdl-aa…

…r-in-ci/wgpu_bins
dotnet · Jun 6, 2024 · df11238 · df11238
2 parents 009bfbd + 1e86672
commit df11238
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/sdl2.yml b/.github/workflows/sdl2.yml
@@ -148,7 +148,7 @@ jobs:
 
       - name: Build SDL2
         if: runner.os != 'Linux'
-        run: ${{ matrix.env.nuke_invoke }} SDL2 ${{ runner.os == 'Windows' && format('{0} {1}', '--native --android-sdk-override', env.ANDROID_HOME) || '' }} 
+        run: ${{ matrix.env.nuke_invoke }} SDL2 ${{ runner.os == 'Windows' && format('{0} {1}', '--native true --android-sdk-override', env.ANDROID_HOME) || '' }} 
         env:
           PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
 
diff --git a/build/nuke/Native/Core.cs b/build/nuke/Native/Core.cs
@@ -68,7 +68,7 @@ public void PrUpdatedNativeBinary(string name)
 
             Git("fetch --all", RootDirectory);
             Git("pull");
-            Git($"add -f src/Native/*/runtimes/*/native/* **/*.aar", RootDirectory);
+            Git($"add -f src/Native/*/runtimes/*/native/* **/*.aar **/*.java .nuke", RootDirectory);
             var newBranch = $"ci/{curBranch}/{name.ToLower().Replace(' ', '_')}_bins";
             var curCommit = GitCurrentCommit(RootDirectory);
             var commitCmd = InheritedShell

diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-arm64/native/wgpu_native.dll b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-arm64/native/wgpu_native.dll
diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-x64/native/wgpu_native.dll b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-x64/native/wgpu_native.dll
diff --git a/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-x86/native/wgpu_native.dll b/src/Native/Silk.NET.WebGPU.Native.WGPU/runtimes/win-x86/native/wgpu_native.dll