From 442b1c5d96e41968dd37b2b2ba83f9592abb86c4 Mon Sep 17 00:00:00 2001 From: Foereaper Date: Sun, 14 Sep 2025 15:28:09 +0200 Subject: [PATCH] Switch to using centralized workflow files --- .github/workflows/linux-build.yml | 68 ---------------------- .github/workflows/on-label-linux-build.yml | 5 +- .github/workflows/on-label-win-build.yml | 5 +- .github/workflows/on-push.yml | 8 ++- .github/workflows/win-build.yml | 37 ------------ 5 files changed, 12 insertions(+), 111 deletions(-) delete mode 100644 .github/workflows/linux-build.yml delete mode 100644 .github/workflows/win-build.yml diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml deleted file mode 100644 index ceb75a8..0000000 --- a/.github/workflows/linux-build.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: Linux Build - -on: - workflow_call: - -jobs: - linux-build: - runs-on: [self-hosted, linux] - - strategy: - fail-fast: false - matrix: - build_type: [Debug] - - steps: - - uses: actions/checkout@v4 - with: - submodules: false - repository: novusengine/Servers - -# - name: Setup premake -# uses: abel0b/setup-premake@v2.4 -# with: -# version: "5.0.0-beta1" - -# - name: Install dependencies -# run: | -# sudo apt-get update && sudo apt-get install -yq clang libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libvulkan-dev -# sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100 - -# - name: Install Vulkan SDK -# run: | -# wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc -# sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list http://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list -# sudo apt update -# sudo apt install vulkan-sdk - - - name: Checkout submodules - run: | - git submodule update --init --recursive - - - name: Run Premake - run: | - 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 - make -j$(nproc) -k \ No newline at end of file diff --git a/.github/workflows/on-label-linux-build.yml b/.github/workflows/on-label-linux-build.yml index 44e7a53..42f38f7 100644 --- a/.github/workflows/on-label-linux-build.yml +++ b/.github/workflows/on-label-linux-build.yml @@ -8,5 +8,6 @@ on: jobs: call-linux-build: if: ${{ github.event.label.name == 'build-linux' }} - name: Linux Build - uses: ./.github/workflows/linux-build.yml + uses: novusengine/Workflows/.github/workflows/linux-build.yml@master + with: + project: Servers \ No newline at end of file diff --git a/.github/workflows/on-label-win-build.yml b/.github/workflows/on-label-win-build.yml index 9f8c523..ab9e0c8 100644 --- a/.github/workflows/on-label-win-build.yml +++ b/.github/workflows/on-label-win-build.yml @@ -8,5 +8,6 @@ on: jobs: call-windows-build: if: ${{ github.event.label.name == 'build-win' }} - name: Windows Build - uses: ./.github/workflows/win-build.yml + uses: novusengine/Workflows/.github/workflows/linux-build.yml@master + with: + project: Servers \ No newline at end of file diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index 609ada6..00eaae4 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -7,11 +7,15 @@ on: jobs: # call-windows-build: # name: Windows Build -# uses: ./.github/workflows/win-build.yml +# uses: novusengine/Workflows/.github/workflows/win-build.yml@master +# with: +# project: Servers call-linux-build: name: Linux Build - uses: ./.github/workflows/linux-build.yml + uses: novusengine/Workflows/.github/workflows/linux-build.yml@master + with: + project: Servers # call-windows-deploy: # needs: call-windows-build diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml deleted file mode 100644 index 839e27d..0000000 --- a/.github/workflows/win-build.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Windows Build - -on: - workflow_call: - -jobs: - win-build: - runs-on: [self-hosted, windows] - - strategy: - fail-fast: false - matrix: - build-type: [RelDebug] - - steps: - - uses: actions/checkout@v4 - with: - submodules: false - repository: novusengine/Servers - - - name: Checkout submodules - run: | - git submodule update --init --recursive - - - name: Premake - run: | - premake5 vs2022 - - - name: Build - run: | - msbuild /m /p:Configuration=${{ matrix.build-type }} Build/Servers.sln - - - name: Upload Game Server artifact - uses: actions/upload-artifact@v4 - with: - name: Server-Game - path: Build/Bin/Servers/${{ matrix.build-type }}/Server-Game.exe