From cdf3f5de6db7e6efa0f77f4f4588a1eaf77f7628 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Tue, 1 Apr 2025 21:22:00 -0700 Subject: [PATCH 1/7] Update build-and-test.yml --- .github/workflows/build-and-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 191efb53..0736c1dc 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -14,6 +14,7 @@ jobs: strategy: matrix: os: [ windows-2022, ubuntu-22.04, macos-13 ] + cmake: [ 3.x ] steps: - uses: actions/checkout@v4 From 8c038d34b37569c94ad31af7fbb26f7d1335457f Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Tue, 1 Apr 2025 21:23:49 -0700 Subject: [PATCH 2/7] Update build-and-test.yml --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0736c1dc..538c05e7 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ windows-2022, ubuntu-22.04, macos-13 ] - cmake: [ 3.x ] + cmake: [ 3.25 ] steps: - uses: actions/checkout@v4 From 5209e57cc1c215dc6afe427db63b2ef1c5478659 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Tue, 1 Apr 2025 21:24:44 -0700 Subject: [PATCH 3/7] Update build-and-test.yml --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 538c05e7..4f4d5243 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -14,7 +14,6 @@ jobs: strategy: matrix: os: [ windows-2022, ubuntu-22.04, macos-13 ] - cmake: [ 3.25 ] steps: - uses: actions/checkout@v4 @@ -35,6 +34,7 @@ jobs: uses: lukka/run-cmake@v10 with: workflowPreset: "ci-${{matrix.os}}" + cmake-version: 3.25 - name: artifacts uses: actions/upload-artifact@v4 with: From 56deead7c4d2ac303e6ab7845967aa63730d0f71 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Tue, 1 Apr 2025 21:28:06 -0700 Subject: [PATCH 4/7] Update build-and-test.yml --- .github/workflows/build-and-test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 4f4d5243..434e7e8b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -16,12 +16,13 @@ jobs: os: [ windows-2022, ubuntu-22.04, macos-13 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 with: + cmake-version: 3.25 submodules: true - name: Add msbuild to PATH (Windows only) if: ${{ matrix.os == 'windows-2022' }} - uses: microsoft/setup-msbuild@v2 + uses: microsoft/setup-msbuild@767f00a3f09872d96a0cb9fcd5e6a4ff33311330 with: vs-version: '[17,18)' msbuild-architecture: x64 @@ -31,12 +32,11 @@ jobs: brew install openssl@3 sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer - name: cmake - uses: lukka/run-cmake@v10 + uses: lukka/run-cmake@67c73a83a46f86c4e0b96b741ac37ff495478c38 with: workflowPreset: "ci-${{matrix.os}}" - cmake-version: 3.25 - name: artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47 with: name: build-${{matrix.os}} path: | From c7eea5643c9231b663b8d45fb6584358e7d08cda Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Tue, 1 Apr 2025 21:32:27 -0700 Subject: [PATCH 5/7] Update build-and-test.yml --- .github/workflows/build-and-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 434e7e8b..a5e70143 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -13,12 +13,14 @@ jobs: continue-on-error: true strategy: matrix: + include: + - cmake: 3.x + cmake_name: CMake 3.x os: [ windows-2022, ubuntu-22.04, macos-13 ] steps: - uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 with: - cmake-version: 3.25 submodules: true - name: Add msbuild to PATH (Windows only) if: ${{ matrix.os == 'windows-2022' }} @@ -35,6 +37,7 @@ jobs: uses: lukka/run-cmake@67c73a83a46f86c4e0b96b741ac37ff495478c38 with: workflowPreset: "ci-${{matrix.os}}" + cmake-version: 3.x - name: artifacts uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47 with: From 8fc72ccf8ae876e5f8fa1fe6f9e05879ea04e18c Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Tue, 1 Apr 2025 21:36:12 -0700 Subject: [PATCH 6/7] Update build-and-test.yml --- .github/workflows/build-and-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index a5e70143..c3eae601 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -13,9 +13,6 @@ jobs: continue-on-error: true strategy: matrix: - include: - - cmake: 3.x - cmake_name: CMake 3.x os: [ windows-2022, ubuntu-22.04, macos-13 ] steps: @@ -33,11 +30,14 @@ jobs: run: | brew install openssl@3 sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer + - name: Get CMake 3.x + uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c + with: + cmakeVersion: "~3.25.0" # <--= optional, use most recent 3.25.x version - name: cmake uses: lukka/run-cmake@67c73a83a46f86c4e0b96b741ac37ff495478c38 with: workflowPreset: "ci-${{matrix.os}}" - cmake-version: 3.x - name: artifacts uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47 with: From fd2a06ef51a3d481c36d89d07ba61ae41b974552 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Tue, 1 Apr 2025 21:45:15 -0700 Subject: [PATCH 7/7] specify up to 3.31 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 642bb9dc..7fce47ee 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ git clone --recursive https://github.com/DarkflameUniverse/DarkflameServer ### Windows packages Ensure that you have either the [MSVC C++ compiler](https://visualstudio.microsoft.com/vs/features/cplusplus/) (recommended) or the [Clang compiler](https://github.com/llvm/llvm-project/releases/) installed. -You'll also need to download and install [CMake](https://cmake.org/download/) (version **CMake version 3.25** or later!). +You'll also need to download and install [CMake](https://cmake.org/download/) (**version 3.25** up to **version 3.31**!). ### MacOS packages Ensure you have [brew](https://brew.sh) installed. @@ -100,7 +100,7 @@ sudo apt install build-essential gcc zlib1g-dev libssl-dev openssl mariadb-serve ``` #### Required CMake version -This project uses **CMake version 3.25** or higher and as such you will need to ensure you have this version installed. +This project uses **CMake version 3.25** up to **version 3.31** and as such you will need to ensure you have this version installed. You can check your CMake version by using the following command in a terminal. ```bash cmake --version