From 0111aa434cd80dd562f0cb8677a06ca89b419ace Mon Sep 17 00:00:00 2001 From: Foereaper Date: Sat, 13 Sep 2025 19:51:11 +0200 Subject: [PATCH 1/2] Run typegenerator before build in Linux workflow --- .github/workflows/linux-build.yml | 20 ++++++++++++++++++++ .github/workflows/on-push.yml | 6 +++--- Submodules/Engine | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index a0052a8a..6a180695 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -9,6 +9,8 @@ jobs: strategy: fail-fast: false + matrix: + build_type: [Debug] steps: - uses: actions/checkout@v4 @@ -46,6 +48,24 @@ jobs: export VULKAN_SDK=/usr/include/vulkan premake5 gmake2 + - name: Build Meta Generator files + run: | + cd Build + make -j$(nproc) -k Gen-Meta + + - name: Run Meta Generator + run: | + META_DIR=Submodules/Engine/Source/Meta/Meta + rm -rf $META_DIR/Generated + Build/Bin/AssetConverter/Engine/${{ matrix.build_type }}/TypeGenerator \ + $META_DIR/Source \ + $META_DIR/Generated + + - name: Re-run Premake + run: | + export VULKAN_SDK=/usr/include/vulkan + premake5 gmake2 + - name: Build run: | cd Build diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index 3e8c575f..b5b43f1e 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -5,9 +5,9 @@ on: workflow_dispatch: jobs: - call-windows-build: - name: Windows Build - uses: ./.github/workflows/win-build.yml +# call-windows-build: +# name: Windows Build +# uses: ./.github/workflows/win-build.yml call-linux-build: name: Linux Build diff --git a/Submodules/Engine b/Submodules/Engine index 73e1a925..f4f58b0e 160000 --- a/Submodules/Engine +++ b/Submodules/Engine @@ -1 +1 @@ -Subproject commit 73e1a925a5526f7369e6b8469c4a62ec4fe4405f +Subproject commit f4f58b0e0aeb866151fff87ebc37d418e81cfd1f From 9ca25576935cd5dd09c8e314b17a44b92a0e87e2 Mon Sep 17 00:00:00 2001 From: Foereaper Date: Sat, 13 Sep 2025 19:52:41 +0200 Subject: [PATCH 2/2] Fix project directory --- .github/workflows/linux-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 6a180695..d474290d 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -57,7 +57,7 @@ jobs: run: | META_DIR=Submodules/Engine/Source/Meta/Meta rm -rf $META_DIR/Generated - Build/Bin/AssetConverter/Engine/${{ matrix.build_type }}/TypeGenerator \ + Build/Bin/Game/Engine/${{ matrix.build_type }}/TypeGenerator \ $META_DIR/Source \ $META_DIR/Generated