Skip to content

Commit

Permalink
WIP: Vendor external
Browse files Browse the repository at this point in the history
  • Loading branch information
OndraVoves committed Mar 2, 2025
1 parent d0d9913 commit 6ee9fae
Show file tree
Hide file tree
Showing 2,298 changed files with 1,624,582 additions and 1,304 deletions.
4 changes: 2 additions & 2 deletions .ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ set -e
ZIG_ARCH=$1
OPTIMIZE=$2

zig/bin/${ZIG_ARCH}/zig build init
zig build init

function build() {
WITH_TRACY=$1
WITH_NFD=$2
WITH_SHADERC=$3
zig/bin/${ZIG_ARCH}/zig build -Doptimize=${OPTIMIZE} -Dwith_tracy=${WITH_TRACY} -Dwith_nfd=${WITH_NFD} -Dwith_shaderc=${WITH_SHADERC}
zig build -Doptimize=${OPTIMIZE} -Dwith_tracy=${WITH_TRACY} -Dwith_nfd=${WITH_NFD} -Dwith_shaderc=${WITH_SHADERC}
}

build true true false
Expand Down
10 changes: 0 additions & 10 deletions .ci/init_zig.sh

This file was deleted.

84 changes: 84 additions & 0 deletions .external_credits.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{
"externals": [
{
"name": "zglfw",
"license": "externals/shared/lib/zglfw/LICENSE"
},
{
"name": "zjobs",
"license": "externals/shared/lib/zjobs/LICENSE"
},
{
"name": "ztracy",
"license": "externals/shared/lib/ztracy/LICENSE"
},
{
"name": "zgui",
"license": "externals/shared/lib/zgui/LICENSE"
},
{
"name": "zflecs",
"license": "externals/shared/lib/zflecs/LICENSE"
},
{
"name": "imgui",
"license": "externals/shared/lib/zgui/libs/imgui/LICENSE.txt"
},
{
"name": "imgui_test_engine",
"license": "externals/shared/lib/zgui/libs/imgui_test_engine/LICENSE.txt"
},
{
"name": "implot",
"license": "externals/shared/lib/zgui/libs/implot/LICENSE"
},
{
"name": "imguizmo",
"license": "externals/shared/lib/zgui/libs/imguizmo/LICENSE"
},
{
"name": "imgui_node_editor",
"license": "externals/shared/lib/zgui/libs/node_editor/LICENSE"
},
{
"name": "FLECS",
"license": "externals/shared/lib/zflecs/libs/flecs/LICENSE"
},
{
"name": "glfw",
"license": "externals/shared/lib/zglfw/libs/glfw/LICENSE.md"
},
{
"name": "SDL_GameControllerDB",
"license": "externals/shared/lib/SDL_GameControllerDB/LICENSE"
},
{
"name": "zf",
"license": "externals/shared/lib/zf/LICENSE"
},
{
"name": "zig-uuid",
"license": "externals/shared/lib/zig-uuid/LICENSE"
},
{
"name": "nativefiledialog-extended",
"license": "externals/shared/lib/znfde/nativefiledialog/LICENSE"
},
{
"name": "bgfx",
"license": "externals/shared/lib/zbgfx/libs/bgfx/LICENSE"
},
{
"name": "zbgfx",
"license": "externals/shared/lib/zbgfx/LICENSE"
},
{
"name": "ziglang-set",
"license": "externals/shared/lib/ziglang-set/LICENSE"
},
{
"name": "cetech1",
"license": "LICENSE"
}
]
}
56 changes: 56 additions & 0 deletions .generate_ide.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"launchers": [
{
"name": "CETech1 no asset root",
"args": []
},
{
"name": "CETech1 max 5 tick",
"args": [
"--max-kernel-tick",
"5",
"--asset-root",
"fixtures/test_asset/"
]
},
{
"name": "CETech1 --headless",
"args": [
"--max-kernel-tick",
"5",
"--asset-root",
"fixtures/test_asset/",
"--headless"
]
},
{
"name": "CETech1 Tests",
"program": "zig-out/bin/cetech1_test",
"args": []
},
{
"name": "CETech1 Tests UI",
"args": [
"--test-ui"
]
},
{
"name": "CETech1 Tests UI (headless)",
"args": [
"--test-ui",
"--headless",
"--test-ui-junit",
"./result.xml"
]
},
{
"name": "CETech1 (Vulkan)",
"args": [
"--asset-root",
"fixtures/test_asset/",
"--renderer",
"vulkan"
]
}
]
}
7 changes: 3 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# LFS

*.png filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
# *.png filter=lfs diff=lfs merge=lfs -text
# *.jpg filter=lfs diff=lfs merge=lfs -text
# *.ttf filter=lfs diff=lfs merge=lfs -text

*.zig text eol=lf

Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: ["main"]
paths:
- ".github/workflows/docs.yaml"
- "Writerside/**"
- "docs/**"

workflow_dispatch:

Expand All @@ -16,9 +16,9 @@ permissions:
actions: write

env:
INSTANCE: Writerside/cetech1
INSTANCE: docs/cetech1
ARTIFACT: webHelpCETECH12-all.zip
DOCKER_VERSION: "242.21870"
DOCKER_VERSION: "243.22562"

jobs:
build:
Expand All @@ -28,8 +28,8 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Pull LFS
run: git lfs pull --include "Writerside/**/*"
# - name: Pull LFS
# run: git lfs pull --include "docs/**/*"

- name: Build Writerside docs using Docker
uses: JetBrains/writerside-github-action@v4
Expand All @@ -39,7 +39,7 @@ jobs:
docker-version: ${{ env.DOCKER_VERSION }}

- name: Save docs to cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
key: docs-cache-${{ github.sha }}
path: |
Expand All @@ -52,7 +52,7 @@ jobs:

steps:
- name: Download docs
uses: actions/cache@v3
uses: actions/cache@v4
with:
key: docs-cache-${{ github.sha }}
path: |
Expand All @@ -74,7 +74,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download docs
uses: actions/cache@v3
uses: actions/cache@v4
with:
key: docs-cache-${{ github.sha }}
path: |
Expand All @@ -88,16 +88,16 @@ jobs:
args: unzip -qq artifacts/${{ env.ARTIFACT }} -d dir

- name: Setup Pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@v4

- name: Upload artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: dir

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4

cleanup:
runs-on: ubuntu-latest
Expand Down
Loading

0 comments on commit 6ee9fae

Please sign in to comment.