bump vcpkg and xmake to latest (#40)

- Improvement: Bumped xmake to 2.9.1 and vcpkg version to 2024.03.25

5 files changed, 18 insertions, 14 deletions

diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index cab550e5f..c7aee4ae4 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -1,7 +1,7 @@
 name: Create Release
 env:
-  VCPKG_VERSION: 2023.07.21
-  XMAKE_VERSION: 2.8.2  # 2.8.3 breaks fetching of asio package on MacOS ARM
+  VCPKG_VERSION: 2024.03.25
+  XMAKE_VERSION: 2.9.1
   WINDOWS_SDK_VERSION: 22621
 
 on:
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 75d9153dc..63f49b70a 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -1,7 +1,7 @@
 name: Validate
 env:
-  VCPKG_VERSION: 2023.07.21
-  XMAKE_VERSION: 2.8.2  # 2.8.3 breaks fetching of asio package on MacOS ARM
+  VCPKG_VERSION: 2024.03.25
+  XMAKE_VERSION: 2.9.1
   WINDOWS_SDK_VERSION: 22621
 
 on:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13adffbf3..53ff24c6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 - Improvement: Add block hash verification for blocks received at oplog import
 - Improvement: Offload block decoding and chunk writing form network worker pool threads (improves download speed for oplog import)
 - Improvement: Add batching when writing multiple small chunks to block store - decreases I/O load significantly on oplog import
+- Improvement: Bumped xmake to 2.9.1 and vcpkg version to 2024.03.25
 
 ## 5.4.4
 - Bugfix: Get raw size for compressed chunks correctly for `/prj/{project}/oplog/{log}/chunkinfos`
diff --git a/README.md b/README.md
index 731daaa0d..d40ee3647 100644
--- a/README.md
+++ b/README.md
@@ -122,13 +122,10 @@ the `CXX` environment variable.
 export CXX=g++-11
 ```
 
-Next we need the `xmake` build system. For this we will download and install
-`xmake` as a `.deb` package. Check the project's release page for more up to
-date `.deb` files.
+Install [xmake](https://xmake.io/#/getting_started).
 
 ```
-wget https://github.com/xmake-io/xmake/releases/download/v2.8.2/xmake-v2.8.2.amd64.deb
-sudo dpkg -i xmake-v2.8.2.amd64.deb
+curl -fsSL https://xmake.io/shget.text | bash
 xmake --version
 ```
 
@@ -196,21 +193,27 @@ Building on Mac is very similar to Linux; install xmake, clone vcpkg and Zen and
 then build the project. You will also need to install Xcode or Xcode command line
 tools.
 
-```
 ## vcpkg
+```
 git clone https://github.com/microsoft/vcpkg.git ~/zen/vcpkg
 ~/zen/vcpkg/bootstrap-vcpkg.sh
 ~/zen/vcpkg/vcpkg --version
+```
 
-## xmake
-curl -L https://github.com/xmake-io/xmake/releases/download/v2.8.2/xmake-v2.8.2.macosx.pkg > xmake-v2.8.2.macosx.pkg
-sudo installer -pkg xmake-v2.8.2.macosx.pkg -target /
+## [xmake](https://xmake.io/#/getting_started)
+```
+curl -fsSL https://xmake.io/shget.text | bash
+xmake --version
+```
 
 ## Zen
+```
 git clone https://github.com/EpicGames/zen.git ~/zen/main
 cd ~/zen/main
+```
 
 ## Build
+```
 export VCPKG_ROOT=~/zen/vcpkg
 xmake config -y --mode=debug --arch=x86_64
 xmake build
diff --git a/xmake.lua b/xmake.lua
index 02781541b..845ac6660 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -7,7 +7,7 @@ add_requires(
     "vcpkg::blake3",
     "vcpkg::cpr",
     "vcpkg::curl",
-    "vcpkg::cxxopts 3.0.0",
+    "vcpkg::cxxopts",
     "vcpkg::doctest",
     "vcpkg::fmt",
     "vcpkg::gsl-lite",