From 736299cbfe88aeb5f380809f1e1a8d9503e76e00 Mon Sep 17 00:00:00 2001 From: Juan Molteni Date: Mon, 8 Jan 2024 11:48:55 -0300 Subject: [PATCH 1/3] Adds Vulkan DLL to output directory --- .github/workflows/Build_LODs.yml | 30 +++++++++++++++++++++++++----- DCL_PiXYZ/DCL_PiXYZ.csproj | 2 +- DCL_PiXYZ/PXZEntryPoint.cs | 4 ---- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Build_LODs.yml b/.github/workflows/Build_LODs.yml index 42c5e1b4..2d46ac31 100644 --- a/.github/workflows/Build_LODs.yml +++ b/.github/workflows/Build_LODs.yml @@ -18,20 +18,40 @@ on: jobs: build-and-run: - runs-on: windows-latest + runs-on: windows-2019 steps: - uses: actions/checkout@v2 with: - lfs: true # This ensures LFS is initialized + lfs: true + + - name: Specify Chocolatey Source + run: choco source add -n=chocolatey -s=https://chocolatey.org/api/v2/ + + - name: Install Visual C++ Redistributable + run: choco install vcredist-all -y - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: dotnet-version: '3.1.x' - - name: Build with dotnet - run: dotnet build --configuration Release --output ./build_output + - name: Publish with dotnet + run: dotnet publish -c Release -r win10-x64 -o ./publish --self-contained true + + - name: Install Vulkan SDK + uses: jakoch/install-vulkan-sdk-action@v1.0.0 + with: + vulkan_version: 1.3.268.0 + optional_components: com.lunarg.vulkan.vma + install_runtime: true + cache: true + destination: ${{ github.workspace }}/publish + + - name: Move Vulkan DLL to output directory + run: | + mv ./publish/1.3.268.0/runtime/x64/vulkan-1.dll ./publish/ + shell: bash - name: Setup Node.js uses: actions/setup-node@v2 @@ -39,7 +59,7 @@ jobs: node-version: '18.14.2' - name: Run the application - run: .\build_output\DCL_PiXYZ.exe "${{ github.event.inputs.sceneType }}" "${{ github.event.inputs.sceneDescription }}" "${{ github.event.inputs.decimationRatio }}" "scene-lod-entities-manifest-builder/" "OutputDirectoryPath/" + run: .\publish\DCL_PiXYZ.exe "${{ github.event.inputs.sceneType }}" "${{ github.event.inputs.sceneDescription }}" "${{ github.event.inputs.decimationRatio }}" "scene-lod-entities-manifest-builder/" "OutputDirectoryPath/" - name: Upload artifacts uses: actions/upload-artifact@v2 diff --git a/DCL_PiXYZ/DCL_PiXYZ.csproj b/DCL_PiXYZ/DCL_PiXYZ.csproj index 8577e872..41bab3fc 100644 --- a/DCL_PiXYZ/DCL_PiXYZ.csproj +++ b/DCL_PiXYZ/DCL_PiXYZ.csproj @@ -1,7 +1,7 @@ - WinExe + Exe netcoreapp3.1 diff --git a/DCL_PiXYZ/PXZEntryPoint.cs b/DCL_PiXYZ/PXZEntryPoint.cs index 47954893..6d44ad7b 100644 --- a/DCL_PiXYZ/PXZEntryPoint.cs +++ b/DCL_PiXYZ/PXZEntryPoint.cs @@ -2,15 +2,11 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Numerics; using System.Threading.Tasks; using DCL_PiXYZ.SceneRepositioner.JsonParsing; using SceneImporter; using UnityEngine.Pixyz.Algo; using UnityEngine.Pixyz.API; -using UnityEngine.Pixyz.Geom; -using UnityEngine.Pixyz.Scene; -using Vector3 = System.Numerics.Vector3; namespace DCL_PiXYZ { From da80a9aefcd66c9afdee1da5ebe61335f8200d04 Mon Sep 17 00:00:00 2001 From: Alejo Thomas Ortega Date: Mon, 8 Jan 2024 17:38:58 -0300 Subject: [PATCH 2/3] generate Vulkan dll outside output directory --- .github/workflows/Build_LODs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Build_LODs.yml b/.github/workflows/Build_LODs.yml index 2d46ac31..9ac130ea 100644 --- a/.github/workflows/Build_LODs.yml +++ b/.github/workflows/Build_LODs.yml @@ -46,11 +46,11 @@ jobs: optional_components: com.lunarg.vulkan.vma install_runtime: true cache: true - destination: ${{ github.workspace }}/publish + destination: ${{ github.workspace }}/vulkan-sdt - name: Move Vulkan DLL to output directory run: | - mv ./publish/1.3.268.0/runtime/x64/vulkan-1.dll ./publish/ + mv ./vulkan-sdt/1.3.268.0/runtime/x64/vulkan-1.dll ./publish/ shell: bash - name: Setup Node.js From 2602fb004de2f9b344a16972968bf38f61213423 Mon Sep 17 00:00:00 2001 From: Alejo Thomas Ortega Date: Mon, 8 Jan 2024 17:39:20 -0300 Subject: [PATCH 3/3] remove not needed vscred dependency --- .github/workflows/Build_LODs.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/Build_LODs.yml b/.github/workflows/Build_LODs.yml index 9ac130ea..ff3c112d 100644 --- a/.github/workflows/Build_LODs.yml +++ b/.github/workflows/Build_LODs.yml @@ -25,12 +25,6 @@ jobs: with: lfs: true - - name: Specify Chocolatey Source - run: choco source add -n=chocolatey -s=https://chocolatey.org/api/v2/ - - - name: Install Visual C++ Redistributable - run: choco install vcredist-all -y - - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: