From cbae9e5960c2089252f8a2e5480ce02b40bdd72c Mon Sep 17 00:00:00 2001 From: Alejo Thomas Ortega Date: Mon, 11 Mar 2024 14:39:45 -0300 Subject: [PATCH 1/2] fix: CI/CD --- .github/workflows/build-docker.yml | 2 +- .github/workflows/trigger-lod-conversion.yml | 62 -------------------- 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 .github/workflows/trigger-lod-conversion.yml diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index e6c96fe6..fa3a78cf 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -2,7 +2,7 @@ name: CI/CD on PRs on: pull_request: - types: [ready_for_review] + types: [opened, synchronize, reopened] jobs: build: diff --git a/.github/workflows/trigger-lod-conversion.yml b/.github/workflows/trigger-lod-conversion.yml deleted file mode 100644 index ff3c112d..00000000 --- a/.github/workflows/trigger-lod-conversion.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Build LOD - -on: - workflow_dispatch: - inputs: - sceneType: - description: 'Hash or coords' - required: true - default: 'coords' - sceneDescription: - description: 'Scene description' - required: true - default: '-129,-77' - decimationRatio: - description: 'Decimation Ratio' - required: true - default: '50' - -jobs: - build-and-run: - runs-on: windows-2019 - - steps: - - uses: actions/checkout@v2 - with: - lfs: true - - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - - 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 }}/vulkan-sdt - - - name: Move Vulkan DLL to output directory - run: | - mv ./vulkan-sdt/1.3.268.0/runtime/x64/vulkan-1.dll ./publish/ - shell: bash - - - name: Setup Node.js - uses: actions/setup-node@v2 - with: - node-version: '18.14.2' - - - name: Run the application - 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 - with: - name: output-artifacts - path: OutputDirectoryPath/ \ No newline at end of file From c32b1f5f67546b37d7a0112b9efb6398e4d93a47 Mon Sep 17 00:00:00 2001 From: Alejo Thomas Ortega Date: Mon, 11 Mar 2024 15:55:39 -0300 Subject: [PATCH 2/2] fix: restore test-lod-converison job --- .github/workflows/test-lod-conversion.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-lod-conversion.yml b/.github/workflows/test-lod-conversion.yml index 96c7f2c4..7f8e4a91 100644 --- a/.github/workflows/test-lod-conversion.yml +++ b/.github/workflows/test-lod-conversion.yml @@ -2,6 +2,7 @@ name: Test LOD Conversion on: pull_request: + types: [edited, opened, reopened, synchronize] jobs: build-and-run: