From b6e2889c0fa720e65f4f55ae0cf40c0dfa307617 Mon Sep 17 00:00:00 2001 From: Foereaper Date: Sat, 13 Sep 2025 20:03:06 +0200 Subject: [PATCH] Run typegenerator before build in Linux workflow --- .github/workflows/linux-build.yml | 20 ++++++++++++++++++++ .github/workflows/on-push.yml | 16 ++++++++-------- Submodules/Engine | 2 +- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 3329ba7..ceb75a8 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 @@ -42,6 +44,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/Servers/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 638cfdf..609ada6 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -5,16 +5,16 @@ 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 uses: ./.github/workflows/linux-build.yml - call-windows-deploy: - needs: call-windows-build - if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch' - name: Windows Deploy - uses: ./.github/workflows/win-deploy.yml \ No newline at end of file +# call-windows-deploy: +# needs: call-windows-build +# if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch' +# name: Windows Deploy +# uses: ./.github/workflows/win-deploy.yml \ No newline at end of file diff --git a/Submodules/Engine b/Submodules/Engine index 73e1a92..f4f58b0 160000 --- a/Submodules/Engine +++ b/Submodules/Engine @@ -1 +1 @@ -Subproject commit 73e1a925a5526f7369e6b8469c4a62ec4fe4405f +Subproject commit f4f58b0e0aeb866151fff87ebc37d418e81cfd1f