From c14c76abe2fd3d86b0cfe516877fce57ac5aa1c8 Mon Sep 17 00:00:00 2001 From: Cory Petkovsek <632766+TokisanGames@users.noreply.github.com> Date: Sat, 28 Dec 2024 16:39:13 +0700 Subject: [PATCH] update web --- .github/workflows/build.yml | 6 +++--- .github/workflows/web.yml | 10 ++-------- Terrain3D.vcxproj | 2 -- Terrain3D.vcxproj.filters | 3 --- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1e1d200..89a49639 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - identifier: [linux, windows, macos, ios, android-arm32, android-arm64, web] + identifier: [linux, windows, macos, ios, android-arm32, android-arm64, web-nothreads] target: [debug, release] include: - identifier: linux @@ -58,9 +58,9 @@ jobs: runner: ubuntu-22.04 flags: arch=arm64 - - identifier: web + - identifier: web-nothreads platform: web - name: 🌐 Web + name: 🌐 Web No-threads runner: ubuntu-22.04 flags: threads=no diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml index 058047b9..00afbc53 100644 --- a/.github/workflows/web.yml +++ b/.github/workflows/web.yml @@ -23,16 +23,10 @@ jobs: with: platform: ${{ matrix.platform }} - # - name: Setup Build Cache - # uses: ./.github/actions/build-cache - # with: - # cache-name: ${{ matrix.platform }}-${{ matrix.target }}-${{ matrix.threads }} - # continue-on-error: true - - name: Setup Build Cache uses: ./.github/actions/build-cache with: - cache-name: ${{ matrix.identifier }}-${{ matrix.target }} + cache-name: ${{ matrix.platform }}-nothreads-${{ matrix.target }} continue-on-error: true - name: Build Terrain3D @@ -53,7 +47,7 @@ jobs: uses: actions/upload-artifact@v4 with: include-hidden-files: true - name: t3d-${{ matrix.platform }}-${{ matrix.target }} + name: t3d-${{ matrix.platform }}-nothreads-${{ matrix.target }} path: | ${{ github.workspace }}/project/ diff --git a/Terrain3D.vcxproj b/Terrain3D.vcxproj index 1d85d069..c1300db3 100644 --- a/Terrain3D.vcxproj +++ b/Terrain3D.vcxproj @@ -174,8 +174,6 @@ - - diff --git a/Terrain3D.vcxproj.filters b/Terrain3D.vcxproj.filters index 0e98e0f7..25df23fe 100644 --- a/Terrain3D.vcxproj.filters +++ b/Terrain3D.vcxproj.filters @@ -115,9 +115,6 @@ - - 1. Project Files - 1. Project Files