From 67491ca91a0916f5bbaccfe8a0ab43b07472a565 Mon Sep 17 00:00:00 2001 From: brainiac Date: Sat, 15 Nov 2025 16:53:54 -0800 Subject: [PATCH 01/10] Test github actions --- .github/workflows/build.yaml | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 00000000000..a66e09f5888 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,57 @@ +name: Build +on: + push: + branches: + - master + pull_request: + +jobs: + build: + name: ${{ matrix.os }} build + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - windows-latest + steps: + - name: Checkout source + uses: actions/checkout@v5 + with: + submodules: recursive + + - name: Install dependencies (Linux) + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y build-essential ninja-build libmariadb-dev libmariadb-dev-compat libboost-all-dev libperl-dev liblua5.1-0-dev libluajit-5.1-dev zlib1g-dev uuid-dev libssl-dev libsodium-dev libmbedtls-dev + + - name: Configure (Linux) + if: runner.os == 'Linux' + run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEQEMU_BUILD_TESTS=OFF -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_CLIENT_FILES=ON + + - name: Build (Linux) + if: runner.os == 'Linux' + run: cmake --build build --parallel + + - name: Enable long paths + if: runner.os == 'Windows' + run: git config --global core.longpaths true + + - name: Setup MSVC environment + if: runner.os == 'Windows' + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: x64 + + - name: Configure (Windows) + if: runner.os == 'Windows' + shell: pwsh + run: cmake -S . -B build -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEQEMU_BUILD_TESTS=OFF -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_CLIENT_FILES=ON + + - name: Build (Windows) + if: runner.os == 'Windows' + shell: pwsh + run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m + From 2f7da472bf9a588af3a3655a065e95fddbb8ec91 Mon Sep 17 00:00:00 2001 From: brainiac Date: Sat, 15 Nov 2025 17:35:53 -0800 Subject: [PATCH 02/10] use separate jobs, unconditionally fetch strawberry perl --- .github/workflows/build.yaml | 38 ++++++++---------- cmake/DependencyHelperMSVC.cmake | 67 +++++++++++++++----------------- 2 files changed, 48 insertions(+), 57 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a66e09f5888..856e2334bad 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -6,52 +6,48 @@ on: pull_request: jobs: - build: - name: ${{ matrix.os }} build - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - windows-latest + linux: + name: Linux build + runs-on: ubuntu-latest steps: - name: Checkout source uses: actions/checkout@v5 with: submodules: recursive - - name: Install dependencies (Linux) - if: runner.os == 'Linux' + - name: Install dependencies run: | sudo apt-get update sudo apt-get install -y build-essential ninja-build libmariadb-dev libmariadb-dev-compat libboost-all-dev libperl-dev liblua5.1-0-dev libluajit-5.1-dev zlib1g-dev uuid-dev libssl-dev libsodium-dev libmbedtls-dev - - name: Configure (Linux) - if: runner.os == 'Linux' + - name: Configure run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEQEMU_BUILD_TESTS=OFF -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_CLIENT_FILES=ON - - name: Build (Linux) - if: runner.os == 'Linux' + - name: Build run: cmake --build build --parallel + windows: + name: Windows build + runs-on: windows-latest + steps: + - name: Checkout source + uses: actions/checkout@v5 + with: + submodules: recursive + - name: Enable long paths - if: runner.os == 'Windows' run: git config --global core.longpaths true - name: Setup MSVC environment - if: runner.os == 'Windows' uses: ilammy/msvc-dev-cmd@v1 with: arch: x64 - - name: Configure (Windows) - if: runner.os == 'Windows' + - name: Configure shell: pwsh run: cmake -S . -B build -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEQEMU_BUILD_TESTS=OFF -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_CLIENT_FILES=ON - - name: Build (Windows) - if: runner.os == 'Windows' + - name: Build shell: pwsh run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m diff --git a/cmake/DependencyHelperMSVC.cmake b/cmake/DependencyHelperMSVC.cmake index 33f92e41b53..1f4554e6ce7 100644 --- a/cmake/DependencyHelperMSVC.cmake +++ b/cmake/DependencyHelperMSVC.cmake @@ -35,60 +35,55 @@ ENDIF() IF(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG) MESSAGE(STATUS "Resolving vcpkg dependencies...") - + IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP}) EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/vcpkg) - + MESSAGE(STATUS "Downloading existing vcpkg dependencies from releases...") - FILE(DOWNLOAD ${EQEMU_VCPKG_URL} ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP} + FILE(DOWNLOAD ${EQEMU_VCPKG_URL} ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP} SHOW_PROGRESS STATUS DOWNLOAD_STATUS) - + LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE) IF(NOT STATUS_CODE EQUAL 0) MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_VCPKG_URL}") ENDIF() - + MESSAGE(STATUS "Extracting files...") EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vcpkg ) ENDIF() - + INCLUDE(${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake) ENDIF() IF(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL) - #Try to find perl first, (so you can use your active install first) - FIND_PACKAGE(PerlLibs) - - IF(NOT PerlLibs_FOUND) - MESSAGE(STATUS "Resolving perl dependencies...") - - IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP}) - EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl) - EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}) - - MESSAGE(STATUS "Downloading portable perl...") - FILE(DOWNLOAD ${EQEMU_PERL_URL} ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP} - SHOW_PROGRESS - STATUS DOWNLOAD_STATUS) - - LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE) - IF(NOT STATUS_CODE EQUAL 0) - MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_PERL_URL}") - ENDIF() - - MESSAGE(STATUS "Extracting files...") - EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR} - ) + MESSAGE(STATUS "Resolving perl dependencies...") + + IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP}) + EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl) + EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}) + + MESSAGE(STATUS "Downloading portable perl...") + FILE(DOWNLOAD ${EQEMU_PERL_URL} ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP} + SHOW_PROGRESS + STATUS DOWNLOAD_STATUS) + + LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE) + IF(NOT STATUS_CODE EQUAL 0) + MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_PERL_URL}") ENDIF() - - SET(PERL_EXECUTABLE ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/bin/perl.exe CACHE FILEPATH "Path to perl program" FORCE) - SET(PERL_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE CACHE PATH "Path to perl include files" FORCE) - SET(PERL_LIBRARY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE/libperl524.a CACHE FILEPATH "Path to perl library" FORCE) + + MESSAGE(STATUS "Extracting files...") + EXECUTE_PROCESS( + COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP} + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR} + ) ENDIF() -ENDIF() \ No newline at end of file + + SET(PERL_EXECUTABLE ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/bin/perl.exe CACHE FILEPATH "Path to perl program" FORCE) + SET(PERL_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE CACHE PATH "Path to perl include files" FORCE) + SET(PERL_LIBRARY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE/libperl524.a CACHE FILEPATH "Path to perl library" FORCE) +ENDIF() From 26b63fed618c4c865f26049a36f10cf06faec388 Mon Sep 17 00:00:00 2001 From: brainiac Date: Sat, 15 Nov 2025 17:59:38 -0800 Subject: [PATCH 03/10] Remove drone config --- .drone.yml | 98 ------------------------------------------------------ 1 file changed, 98 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 7a5443d4c4d..00000000000 --- a/.drone.yml +++ /dev/null @@ -1,98 +0,0 @@ ---- - -kind: pipeline -type: docker -name: Build Linux - -# Limits how many of these builds can run on the drone runner at a time, this isn't about cores -concurrency: - limit: 1 - -volumes: - - name: cache - host: - path: /var/lib/cache-release - -steps: - - name: Build Linux X64 - image: akkadius/eqemu-server:v14 - environment: - GITHUB_TOKEN: - from_secret: GH_RELEASE_GITHUB_API_TOKEN - RCLONE_CONFIG_REMOTE_TYPE: ftp - RCLONE_FTP_HOST: drone.akkadius.com - RCLONE_FTP_USER: artifacts - RCLONE_FTP_PASS: - from_secret: RCLONE_FTP_PASS - commands: - - ./utils/scripts/build/linux-build.sh - volumes: - - name: cache - path: /home/eqemu/.ccache/ - ---- - -kind: pipeline -type: exec -name: Build Windows - -# Limits how many of these builds can run on the drone runner at a time, this isn't about cores -concurrency: - limit: 1 - -platform: - os: windows - arch: amd64 - -steps: - - name: Build Windows X64 - environment: - RCLONE_CONFIG_REMOTE_TYPE: ftp - RCLONE_FTP_HOST: drone.akkadius.com - RCLONE_FTP_USER: artifacts - RCLONE_FTP_PASS: - from_secret: RCLONE_FTP_PASS - GITHUB_TOKEN: - from_secret: GH_RELEASE_GITHUB_API_TOKEN - commands: - - .\utils\scripts\build\windows-build.ps1 - ---- - -kind: pipeline -type: docker -name: Publish Artifacts to Github - -steps: - - name: Upload Artifacts - image: akkadius/eqemu-build-releaser:v3 - environment: - RCLONE_CONFIG_REMOTE_TYPE: ftp - RCLONE_FTP_HOST: drone.akkadius.com - RCLONE_FTP_USER: artifacts - RCLONE_FTP_PASS: - from_secret: RCLONE_FTP_PASS - GH_RELEASE_GITHUB_API_TOKEN: - from_secret: GH_RELEASE_GITHUB_API_TOKEN - GITHUB_TOKEN: - from_secret: GH_RELEASE_GITHUB_API_TOKEN - commands: - - ./utils/scripts/build/should-release/should-release - - rclone config create remote ftp env_auth true > /dev/null - - | - rclone copy remote: --include "eqemu-server*.zip" . - - gh-release --assets=eqemu-server-linux-x64.zip,eqemu-server-windows-x64.zip -y - - | - rclone delete remote: --include "eqemu-server*.zip" - -trigger: - branch: - - master - event: - - push - -depends_on: - - Build Windows - - Build Linux - - From 42ae9761a2d077f0ed2536e93a3a885e2439ced9 Mon Sep 17 00:00:00 2001 From: brainiac Date: Sat, 15 Nov 2025 17:59:47 -0800 Subject: [PATCH 04/10] cmake args --- .github/workflows/build.yaml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 856e2334bad..2c77c5717f6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,7 +7,7 @@ on: jobs: linux: - name: Linux build + name: Linux runs-on: ubuntu-latest steps: - name: Checkout source @@ -21,13 +21,21 @@ jobs: sudo apt-get install -y build-essential ninja-build libmariadb-dev libmariadb-dev-compat libboost-all-dev libperl-dev liblua5.1-0-dev libluajit-5.1-dev zlib1g-dev uuid-dev libssl-dev libsodium-dev libmbedtls-dev - name: Configure - run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEQEMU_BUILD_TESTS=OFF -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_CLIENT_FILES=ON + run: | + cmake -S . -B build -G Ninja \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DEQEMU_BUILD_TESTS=ON \ + -DEQEMU_BUILD_STATIC=ON \ + -DEQEMU_BUILD_LOGIN=ON \ + -DEQEMU_BUILD_LUA=ON \ + -DEQEMU_BUILD_PERL=ON \ + -DEQEMU_BUILD_CLIENT_FILES=ON - name: Build run: cmake --build build --parallel windows: - name: Windows build + name: Windows runs-on: windows-latest steps: - name: Checkout source @@ -45,7 +53,15 @@ jobs: - name: Configure shell: pwsh - run: cmake -S . -B build -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DEQEMU_BUILD_TESTS=OFF -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_CLIENT_FILES=ON + run: | + cmake -S . -B build -G "Visual Studio 17 2022" -A x64 ` + -DCMAKE_BUILD_TYPE=RelWithDebInfo ` + -DEQEMU_BUILD_TESTS=ON ` + -DEQEMU_BUILD_STATIC=ON ` + -DEQEMU_BUILD_LOGIN=ON ` + -DEQEMU_BUILD_LUA=ON ` + -DEQEMU_BUILD_PERL=ON ` + -DEQEMU_BUILD_CLIENT_FILES=ON - name: Build shell: pwsh From c9f61fb6ad533eb59ddf5e4ef9ff58d4a9e64e25 Mon Sep 17 00:00:00 2001 From: brainiac Date: Sat, 15 Nov 2025 18:05:11 -0800 Subject: [PATCH 05/10] Try ccache --- .github/workflows/build.yaml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2c77c5717f6..f298d5fe289 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,15 +15,22 @@ jobs: with: submodules: recursive + - name: Setup ccache + uses: hendrikmuhs/ccache-action@v1.2 + with: + key: ${{ runner.os }}-ccache + - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y build-essential ninja-build libmariadb-dev libmariadb-dev-compat libboost-all-dev libperl-dev liblua5.1-0-dev libluajit-5.1-dev zlib1g-dev uuid-dev libssl-dev libsodium-dev libmbedtls-dev + sudo apt-get install -y build-essential ninja-build ccache libmariadb-dev libmariadb-dev-compat libboost-all-dev libperl-dev liblua5.1-0-dev libluajit-5.1-dev zlib1g-dev uuid-dev libssl-dev libsodium-dev libmbedtls-dev - name: Configure run: | cmake -S . -B build -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DEQEMU_BUILD_TESTS=ON \ -DEQEMU_BUILD_STATIC=ON \ -DEQEMU_BUILD_LOGIN=ON \ @@ -34,6 +41,10 @@ jobs: - name: Build run: cmake --build build --parallel + - name: Test + working-directory: build + run: ./bin/tests + windows: name: Windows runs-on: windows-latest @@ -51,11 +62,18 @@ jobs: with: arch: x64 + - name: Setup ccache + uses: hendrikmuhs/ccache-action@v1.2 + with: + key: ${{ runner.os }}-ccache + - name: Configure shell: pwsh run: | cmake -S . -B build -G "Visual Studio 17 2022" -A x64 ` -DCMAKE_BUILD_TYPE=RelWithDebInfo ` + -DCMAKE_C_COMPILER_LAUNCHER=ccache ` + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` -DEQEMU_BUILD_TESTS=ON ` -DEQEMU_BUILD_STATIC=ON ` -DEQEMU_BUILD_LOGIN=ON ` @@ -67,3 +85,6 @@ jobs: shell: pwsh run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m + - name: Test + working-directory: build + run: ./bin/RelWithDebInfo/tests.exe From 10e26b2a97c0af6b51a42f9692fff49da1601d95 Mon Sep 17 00:00:00 2001 From: brainiac Date: Sat, 15 Nov 2025 20:00:28 -0800 Subject: [PATCH 06/10] Static build doesn't work --- .github/workflows/build.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f298d5fe289..9710b1ccea2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -32,7 +32,6 @@ jobs: -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DEQEMU_BUILD_TESTS=ON \ - -DEQEMU_BUILD_STATIC=ON \ -DEQEMU_BUILD_LOGIN=ON \ -DEQEMU_BUILD_LUA=ON \ -DEQEMU_BUILD_PERL=ON \ @@ -75,10 +74,9 @@ jobs: -DCMAKE_C_COMPILER_LAUNCHER=ccache ` -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` -DEQEMU_BUILD_TESTS=ON ` - -DEQEMU_BUILD_STATIC=ON ` -DEQEMU_BUILD_LOGIN=ON ` -DEQEMU_BUILD_LUA=ON ` - -DEQEMU_BUILD_PERL=ON ` + -DEQEMU_BUILD_ZLIB=ON ` -DEQEMU_BUILD_CLIENT_FILES=ON - name: Build From 81db956eed6df1c8d3d7914bcaae80169410692d Mon Sep 17 00:00:00 2001 From: brainiac Date: Sun, 16 Nov 2025 20:36:36 -0800 Subject: [PATCH 07/10] does symlink work on windows? --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9710b1ccea2..f8c0af023fa 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -65,6 +65,7 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ runner.os }}-ccache + create-symlink: true - name: Configure shell: pwsh From 86d077a01d5abdc73c99c9737376f7c0f3c17458 Mon Sep 17 00:00:00 2001 From: brainiac Date: Mon, 17 Nov 2025 00:09:55 -0800 Subject: [PATCH 08/10] trying things differently --- .github/workflows/build.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f8c0af023fa..7c646a830c2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -65,24 +65,22 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ runner.os }}-ccache - create-symlink: true - name: Configure shell: pwsh run: | - cmake -S . -B build -G "Visual Studio 17 2022" -A x64 ` + cmake -S . -B build -G "Ninja" ` -DCMAKE_BUILD_TYPE=RelWithDebInfo ` -DCMAKE_C_COMPILER_LAUNCHER=ccache ` -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` -DEQEMU_BUILD_TESTS=ON ` -DEQEMU_BUILD_LOGIN=ON ` -DEQEMU_BUILD_LUA=ON ` - -DEQEMU_BUILD_ZLIB=ON ` -DEQEMU_BUILD_CLIENT_FILES=ON - name: Build shell: pwsh - run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m + run: cmake --build build --parallel - name: Test working-directory: build From eacb8943c3b156b94cb8dd3788a5717ab1adbf6e Mon Sep 17 00:00:00 2001 From: brainiac Date: Mon, 17 Nov 2025 00:14:09 -0800 Subject: [PATCH 09/10] fixes --- .github/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7c646a830c2..f2defa3fec5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -73,6 +73,7 @@ jobs: -DCMAKE_BUILD_TYPE=RelWithDebInfo ` -DCMAKE_C_COMPILER_LAUNCHER=ccache ` -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` + -DBUILD_SHARED_LIBS=OFF ` -DEQEMU_BUILD_TESTS=ON ` -DEQEMU_BUILD_LOGIN=ON ` -DEQEMU_BUILD_LUA=ON ` @@ -84,4 +85,4 @@ jobs: - name: Test working-directory: build - run: ./bin/RelWithDebInfo/tests.exe + run: .\bin\tests.exe From d92468e81e47065310031089945018d6f59444ba Mon Sep 17 00:00:00 2001 From: brainiac Date: Mon, 17 Nov 2025 00:27:27 -0800 Subject: [PATCH 10/10] Not having any luck with ccache on windows, so dropping it for now --- .github/workflows/build.yaml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f2defa3fec5..c9650cf56d5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -61,28 +61,21 @@ jobs: with: arch: x64 - - name: Setup ccache - uses: hendrikmuhs/ccache-action@v1.2 - with: - key: ${{ runner.os }}-ccache - - name: Configure shell: pwsh run: | - cmake -S . -B build -G "Ninja" ` + cmake -S . -B build -G "Visual Studio 17 2022" -A x64 ` -DCMAKE_BUILD_TYPE=RelWithDebInfo ` - -DCMAKE_C_COMPILER_LAUNCHER=ccache ` - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ` - -DBUILD_SHARED_LIBS=OFF ` -DEQEMU_BUILD_TESTS=ON ` -DEQEMU_BUILD_LOGIN=ON ` -DEQEMU_BUILD_LUA=ON ` + -DEQEMU_BUILD_ZLIB=ON ` -DEQEMU_BUILD_CLIENT_FILES=ON - name: Build shell: pwsh - run: cmake --build build --parallel + run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m - name: Test working-directory: build - run: .\bin\tests.exe + run: ./bin/RelWithDebInfo/tests.exe