Skip to content

Commit

Permalink
update web
Browse files Browse the repository at this point in the history
  • Loading branch information
TokisanGames committed Dec 28, 2024
1 parent 0ed9aa2 commit c14c76a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/
Expand Down
2 changes: 0 additions & 2 deletions Terrain3D.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,6 @@
<ItemGroup>
<None Include=".github\actions\base-deps\action.yml" />
<None Include=".github\actions\build-cache\action.yml" />
<None Include=".github\actions\web-deps\action.yml" />
<None Include=".github\actions\windows-deps\action.yml" />
<None Include=".github\ISSUE_TEMPLATE\bug_report.yml" />
<None Include=".github\ISSUE_TEMPLATE\config.yml" />
<None Include=".github\ISSUE_TEMPLATE\feature_request.yml" />
Expand Down
3 changes: 0 additions & 3 deletions Terrain3D.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include=".github\actions\windows-deps\action.yml">
<Filter>1. Project Files</Filter>
</None>
<None Include=".github\actions\build-cache\action.yml">
<Filter>1. Project Files</Filter>
</None>
Expand Down

0 comments on commit c14c76a

Please sign in to comment.