From 02a5961f39673be403fda3edbf6fb1265bd93477 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Tue, 17 Mar 2026 21:39:22 +0000 Subject: Move project to CMake (#781) * Move to cmake * Move sources to source_groups and ditch more old VS files * Add BuildVer.h generation * Break out cmake source lists to platforms * Don't copy swf files * Revert audio changes from merge * Add platform defines * Match MSBuild flags * Move BuildVer.h to common include and fix rebuild issue * Seperate projects properly * Exclude more files and make sure GameHDD exists * Missing line * Remove remaining VS project files * Update readme and actions * Use incremental LTCG * Update workflows * Update build workflows and output folder * Disable vcpkg checks * Force MSVC * Use precompiled headers * Only use PCH for cpp * Exclude compat_shims from PCH * Handle per-platform source includes * Copy only current platform media * Define Iggy libs per platform * Fix EnsureGameHDD check * Only set WIN32_EXECUTABLE on Windows * Correct Iggy libs path * Remove include of terrain_MipmapLevel * Correct path to xsb/xwb * Implement copilot suggestions * Add clang flags (untested) * Fix robocopy error checking * Update documentation * Drop CMakePresets.json version as we dont use v6 features * Always cleanup artifacts in nightly even if some builds fail * Re-work compiler target options * Move newer iggy dll into redist and cleanup * Fix typos * Remove 'Source Files' from all source groups * Remove old ps1 build scripts --- .github/workflows/build.yml | 31 ----------- .github/workflows/debug-test.yml | 32 ------------ .github/workflows/nightly-server.yml | 99 ++++++++++++++++++++++++++++++++++++ .github/workflows/nightly.yml | 91 ++++++++++++++++++++++----------- .github/workflows/pull-request.yml | 32 ++++++++++++ 5 files changed, 192 insertions(+), 93 deletions(-) delete mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/debug-test.yml create mode 100644 .github/workflows/nightly-server.yml create mode 100644 .github/workflows/pull-request.yml (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index a499ff84..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Build Minecraft Legacy Console Edition -on: - workflow_dispatch: - -jobs: - build: - runs-on: windows-2022 - - strategy: - matrix: - configuration: [Release, Debug] - - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v2 - - - name: Build Minecraft Legacy Console Edition - run: | - msbuild MinecraftConsoles.sln ` - /p:Configuration=${{ matrix.configuration }} ` - /p:Platform=Windows64 ` - /m - - - name: Upload Release + Debug Artifacts - uses: actions/upload-artifact@v4 - with: - name: MinecraftClient-${{ matrix.configuration }} - path: x64/${{ matrix.configuration }} diff --git a/.github/workflows/debug-test.yml b/.github/workflows/debug-test.yml deleted file mode 100644 index 4acd5fc5..00000000 --- a/.github/workflows/debug-test.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: MSBuild Debug Test - -on: - workflow_dispatch: - pull_request: - types: [opened, reopened, synchronize] - paths-ignore: - - '.gitignore' - - '*.md' - - '.github/*.md' - push: - branches: - - 'main' - paths-ignore: - - '.gitignore' - - '*.md' - - '.github/*.md' - -jobs: - build: - name: Build Windows64 (DEBUG) - runs-on: windows-latest - - steps: - - name: Checkout - uses: actions/checkout@v6 - - - name: Setup msbuild - uses: microsoft/setup-msbuild@v2 - - - name: Build - run: MSBuild.exe MinecraftConsoles.sln /p:Configuration=Debug /p:Platform="Windows64" diff --git a/.github/workflows/nightly-server.yml b/.github/workflows/nightly-server.yml new file mode 100644 index 00000000..a55a2a62 --- /dev/null +++ b/.github/workflows/nightly-server.yml @@ -0,0 +1,99 @@ +name: Nightly Server Release + +on: + workflow_dispatch: + push: + branches: + - 'main' + paths-ignore: + - '.gitignore' + - '*.md' + - '.github/**' + - '!.github/workflows/nightly-server.yml' + +permissions: + contents: write + +jobs: + build: + runs-on: windows-latest + + strategy: + matrix: + platform: [Windows64] + + steps: + - name: Checkout + uses: actions/checkout@v6 + + - name: Set platform lowercase + run: echo "PLATFORM=$('${{ matrix.platform }}'.ToLower())" >> $env:GITHUB_ENV + + - name: Setup MSVC + uses: ilammy/msvc-dev-cmd@v1 + + - name: Setup CMake + uses: lukka/get-cmake@latest + + - name: Run CMake + uses: lukka/run-cmake@v10 + env: + VCPKG_ROOT: "" # Disable vcpkg for CI builds + with: + configurePreset: ${{ env.PLATFORM }} + buildPreset: ${{ env.PLATFORM }}-release + buildPresetAdditionalArgs: "['--target', 'Minecraft.Server']" + + - name: Zip Build + run: 7z a -r LCEServer${{ matrix.platform }}.zip ./build/${{ env.PLATFORM }}/Minecraft.Server/Release/* -x!*.ipdb -x!*.iobj + + - name: Stage artifacts + run: | + New-Item -ItemType Directory -Force -Path staging + Copy-Item LCEServer${{ matrix.platform }}.zip staging/ + + - name: Stage exe and pdb + if: matrix.platform == 'Windows64' + run: | + Copy-Item ./build/${{ env.PLATFORM }}/Minecraft.Server/Release/Minecraft.Server.exe staging/ + + - name: Upload artifacts + uses: actions/upload-artifact@v6 + with: + name: build-${{ matrix.platform }} + path: staging/* + + release: + needs: build + runs-on: ubuntu-latest + + steps: + - name: Download all artifacts + uses: actions/download-artifact@v7 + with: + path: artifacts + merge-multiple: true + + - name: Update release + uses: andelf/nightly-release@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: nightly-dedicated-server + name: Nightly Dedicated Server Release + body: | + Dedicated Server runtime for Windows64. + + Download `LCEServerWindows64.zip` and extract it to a folder where you'd like to keep the server runtime. + files: | + artifacts/* + + cleanup: + needs: [build, release] + if: always() + runs-on: ubuntu-latest + steps: + - name: Cleanup artifacts + uses: geekyeggo/delete-artifact@v5 + with: + name: build-* diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5af23fe6..ad3a816a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,41 +1,80 @@ -name: Nightly Releases +name: Nightly Release on: workflow_dispatch: push: branches: - 'main' - - 'feature/dedicated-server' paths-ignore: - '.gitignore' - '*.md' - - '.github/*.md' + - '.github/**' + - '!.github/workflows/nightly.yml' permissions: contents: write jobs: build: - name: Build Windows64 runs-on: windows-latest + strategy: + matrix: + platform: [Windows64] + steps: - name: Checkout uses: actions/checkout@v6 - - name: Setup msbuild - uses: microsoft/setup-msbuild@v2 + - name: Set platform lowercase + run: echo "PLATFORM=$('${{ matrix.platform }}'.ToLower())" >> $env:GITHUB_ENV - - name: Build - run: MSBuild.exe MinecraftConsoles.sln /p:Configuration=Release /p:Platform="Windows64" + - name: Setup MSVC + uses: ilammy/msvc-dev-cmd@v1 + + - name: Setup CMake + uses: lukka/get-cmake@latest + + - name: Run CMake + uses: lukka/run-cmake@v10 + env: + VCPKG_ROOT: "" # Disable vcpkg for CI builds + with: + configurePreset: ${{ env.PLATFORM }} + buildPreset: ${{ env.PLATFORM }}-release + buildPresetAdditionalArgs: "['--target', 'Minecraft.Client']" - name: Zip Build - run: 7z a -r LCEWindows64.zip ./x64/Release/* + run: 7z a -r LCE${{ matrix.platform }}.zip ./build/${{ env.PLATFORM }}/Minecraft.Client/Release/* -x!*.ipdb -x!*.iobj + + - name: Stage artifacts + run: | + New-Item -ItemType Directory -Force -Path staging + Copy-Item LCE${{ matrix.platform }}.zip staging/ + + - name: Stage exe and pdb + if: matrix.platform == 'Windows64' + run: | + Copy-Item ./build/${{ env.PLATFORM }}/Minecraft.Client/Release/Minecraft.Client.exe staging/ + + - name: Upload artifacts + uses: actions/upload-artifact@v6 + with: + name: build-${{ matrix.platform }} + path: staging/* + + release: + needs: build + runs-on: ubuntu-latest - - name: Zip Dedicated Server Build - run: 7z a -r LCEServerWindows64.zip ./x64/Minecraft.Server/Release/* + steps: + - name: Download all artifacts + uses: actions/download-artifact@v7 + with: + path: artifacts + merge-multiple: true - - name: Update Client release + - name: Update release uses: andelf/nightly-release@main env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -43,27 +82,19 @@ jobs: tag_name: nightly name: Nightly Client Release body: | - Requires at least Windows 7 and DirectX 11 compatible GPU to run. Compiled with MSVC v14.44.35207 in Release mode with Whole Program Optimization, as well as `/O2 /Ot /Oi /Ob3 /GF /fp:precise`. + Requires at least Windows 7 and DirectX 11 compatible GPU to run. # 🚨 First time here? 🚨 If you've never downloaded the game before, you need to download `LCEWindows64.zip` and extract it to the folder where you'd like to keep the game. The other files are included in this `.zip` file! files: | - LCEWindows64.zip - ./x64/Release/Minecraft.Client.exe - ./x64/Release/Minecraft.Client.pdb + artifacts/* - - name: Update Dedicated Server release - uses: andelf/nightly-release@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + cleanup: + needs: [build, release] + if: always() + runs-on: ubuntu-latest + steps: + - name: Cleanup artifacts + uses: geekyeggo/delete-artifact@v5 with: - tag_name: nightly-dedicated-server - name: Nightly Dedicated Server Release - body: | - Dedicated Server runtime for Windows64. - - Download `LCEServerWindows64.zip` and extract it to a folder where you'd like to keep the server runtime. - files: | - LCEServerWindows64.zip - ./x64/Minecraft.Server/Release/Minecraft.Server.exe - ./x64/Minecraft.Server/Release/Minecraft.Server.pdb + name: build-* diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml new file mode 100644 index 00000000..9d57f4b4 --- /dev/null +++ b/.github/workflows/pull-request.yml @@ -0,0 +1,32 @@ +name: Pull Request Build + +on: + workflow_dispatch: + pull_request: + types: [opened, reopened, synchronize] + paths-ignore: + - '.gitignore' + - '*.md' + - '.github/*.md' + +jobs: + build: + runs-on: windows-latest + + steps: + - name: Checkout + uses: actions/checkout@v6 + + - name: Setup MSVC + uses: ilammy/msvc-dev-cmd@v1 + + - name: Setup CMake + uses: lukka/get-cmake@latest + + - name: Run CMake + uses: lukka/run-cmake@v10 + env: + VCPKG_ROOT: "" # Disable vcpkg for CI builds + with: + configurePreset: windows64 + buildPreset: windows64-debug -- cgit v1.2.3