WIP: Vendor external

Author: OndraVoves

.ci/build.sh

@@ -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

.ci/init_zig.sh

@@ -18,7 +18,7 @@ permissions:
 env:
   INSTANCE: Writerside/cetech1
   ARTIFACT: webHelpCETECH12-all.zip
-  DOCKER_VERSION: "242.21870"
+  DOCKER_VERSION: "243.22562"
 
 jobs:
   build:

.github/workflows/docs.yaml

@@ -29,26 +29,19 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          submodules: true
 
       - name: Read .zig-version
         id: zigversion
         uses: juliangruber/read-file-action@v1
         with:
           path: ./.zigversion
-      - name: Cache zig binary
-        id: cache-zig
-        uses: actions/cache@v4
+      - name: Install Zig
+        uses: mlugg/setup-zig@v1
         with:
-          path: zig/bin/x86_64-linux/zig
-          key: ${{ runner.arch }}-${{ runner.os }}-zig-${{ steps.zigversion.outputs.content }}
-      - name: Init zig
-        if: steps.cache-zig.outputs.cache-hit != 'true'
-        run: .ci/init_zig.sh x86_64-linux
+          version: ${{ steps.zigversion.outputs.content }}
 
       - name: Lint
-        run: zig/bin/x86_64-linux/zig fmt --check . --exclude externals/
+        run: zig fmt --check . --exclude externals/
 
   x86-64-linux:
     needs: ["validation"]
@@ -61,7 +54,6 @@ jobs:
         with:
           submodules: true
 
-          
       - name: Prepare
         uses: awalsh128/cache-apt-pkgs-action@latest
         with:
@@ -75,12 +67,10 @@ jobs:
         uses: juliangruber/read-file-action@v1
         with:
           path: ./.zigversion
-      - name: Cache zig binary
-        id: cache-zig
-        uses: actions/cache@v4
+      - name: Install Zig
+        uses: mlugg/setup-zig@v1
         with:
-          path: zig/bin/x86_64-linux/zig
-          key: ${{ runner.arch }}-${{ runner.os }}-zig-${{ steps.zigversion.outputs.content }}
+          version: ${{ steps.zigversion.outputs.content }}
 
       - name: Zig cache
         uses: actions/cache/restore@v4
@@ -94,10 +84,6 @@ jobs:
       #     path: .zig-cache
       #     key: ${{ runner.arch }}-${{ runner.os }}-zig-build-cache
 
-      - name: Init zig
-        if: steps.cache-zig.outputs.cache-hit != 'true'
-        run: .ci/init_zig.sh x86_64-linux
-
       - name: Build
         run: .ci/build.sh x86_64-linux Debug
 
@@ -137,7 +123,6 @@ jobs:
       # - name: Setup headless display
       #   uses: pyvista/setup-headless-display-action@v2
 
-      # TODO: Fix linux CI
       - name: Test headless standalone
         run: zig-out/bin/cetech1 --headless --max-kernel-tick 5
 
@@ -168,7 +153,7 @@ jobs:
         with:
           submodules: true
 
-      # - name: Prepare
+      # - name: Prepare`
       #   run: |
       #     brew update
       #     brew install kcov
@@ -178,13 +163,10 @@ jobs:
         uses: juliangruber/read-file-action@v1
         with:
           path: ./.zigversion
-
-      - name: Cache zig binary
-        id: cache-zig
-        uses: actions/cache@v4
+      - name: Install Zig
+        uses: mlugg/setup-zig@v1
         with:
-          path: zig/bin/x86_64-macos/zig
-          key: ${{ runner.arch }}-${{ runner.os }}-zig-${{ steps.zigversion.outputs.content }}
+          version: ${{ steps.zigversion.outputs.content }}
 
       - name: Zig cache
         uses: actions/cache/restore@v4
@@ -197,10 +179,6 @@ jobs:
       #   with:
       #     path: .zig-cache
       #     key: ${{ runner.arch }}-${{ runner.os }}-zig-build-cache
-  
-      - name: Init zig
-        if: steps.cache-zig.outputs.cache-hit != 'true'
-        run: .ci/init_zig.sh x86_64-macos
 
       - name: Build
         run: .ci/build.sh x86_64-macos Debug
@@ -258,19 +236,17 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
-          
+
       - name: Read .zig-version
         id: zigversion
         uses: juliangruber/read-file-action@v1
         with:
           path: ./.zigversion
-      - name: Cache zig binary
-        id: cache-zig
-        uses: actions/cache@v4
+      - name: Install Zig
+        uses: mlugg/setup-zig@v1
         with:
-          path: zig/bin/x86_64-windows/zig.exe
-          key: ${{ runner.arch }}-${{ runner.os }}-zig-${{ steps.zigversion.outputs.content }}
-      
+          version: ${{ steps.zigversion.outputs.content }}
+
       - name: Zig cache
         uses: actions/cache/restore@v4
         with:
@@ -283,11 +259,6 @@ jobs:
       #     path: .zig-cache
       #     key: ${{ runner.arch }}-${{ runner.os }}-zig-build-cache
 
-      - name: Init zig
-        if: steps.cache-zig.outputs.cache-hit != 'true'
-        shell: bash
-        run: .ci/init_zig.sh x86_64-windows
-
       - name: Build
         shell: bash
         run: .ci/build.sh x86_64-windows Debug
@@ -300,7 +271,6 @@ jobs:
           overwrite: true
           retention-days: 1
 
-
       - name: Zig cache
         uses: actions/cache/save@v4
         with:

.github/workflows/test.yaml

@@ -1,24 +1,3 @@
-[submodule "externals/shared/lib/zig-gamedev"]
-	path = externals/shared/lib/zig-gamedev
-	url = https://github.com/OndraVoves/zig-gamedev.git
-[submodule "externals/shared/tools/zls"]
-	path = externals/shared/tools/zls
-	url = https://github.com/zigtools/zls.git
-[submodule "externals/shared/lib/SDL_GameControllerDB"]
-	path = externals/shared/lib/SDL_GameControllerDB
-	url = https://github.com/mdqinc/SDL_GameControllerDB.git
-[submodule "zig"]
-	path = zig
-	url = https://github.com/cyberegoorg/cetech1-zig.git
-[submodule "externals/shared/lib/zbgfx"]
-	path = externals/shared/lib/zbgfx
-	url = https://github.com/cyberegoorg/zbgfx.git
-[submodule "externals/shared/lib/ziglang-set"]
-	path = externals/shared/lib/ziglang-set
-	url = https://github.com/deckarep/ziglang-set
-[submodule "externals/shared/lib/zig-uuid"]
-	path = externals/shared/lib/zig-uuid
-	url = https://github.com/tensorush/zig-uuid.git
-[submodule "externals/shared/lib/zf"]
-	path = externals/shared/lib/zf
-	url = https://github.com/OndraVoves/zf.git
+[submodule "externals/shared"]
+	path = externals/shared
+	url = https://github.com/cyberegoorg/cetech1-externals-shared.git

.gitmodules

@@ -1 +1 @@
-0.14.0-dev.1911+3bf89f55c
+2024.10.0-mach

.idea/.gitignore

@@ -5,14 +5,9 @@
 
 Yet another experimental game engine but now in [zig](https://ziglang.org).
 
+> [!IMPORTANT]  
+> Work in progressssssssssssss
+
 ## [Getting started](https://cyberegoorg.github.io/cetech1/getting-started.html)
 
 ## [Documentation](https://cyberegoorg.github.io/cetech1)
-
-## Credits/Licenses For Fonts Included In Repository
-
-Some fonts files are available in the `src/embed/fonts/` folder:
-
-- **[Roboto-Medium.ttf](https://fonts.google.com/specimen/Roboto)** - Apache License 2.0
-- **[fa-solid-900.ttf](https://fontawesome.com)** - SIL OFL 1.1 License
-- **[fa-regular-400.ttf](https://fontawesome.com)** - SIL OFL 1.1 License

.idea/vcs.xml

@@ -1 +1 @@
-zig/bin/<ARCH>/zig build
+zig build