From b1837571cc3beb7188b3da4ea513a11d0d3c23aa Mon Sep 17 00:00:00 2001 From: ShiftyX1 Date: Mon, 8 Dec 2025 23:52:11 +0300 Subject: [PATCH] fix: update CMake installation process and add wget for dependency management --- .github/workflows/appimage.yml | 7 ++++++- .github/workflows/cmake.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index beb9b5c3..95357333 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -31,7 +31,12 @@ jobs: sudo apt-get update sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglew2.2 \ libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev \ - libcurl4-openssl-dev libgtest-dev cmake squashfs-tools valgrind + libcurl4-openssl-dev libgtest-dev squashfs-tools valgrind wget + # Install CMake >= 3.26 + wget https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-linux-x86_64.sh + chmod +x cmake-3.27.9-linux-x86_64.sh + sudo ./cmake-3.27.9-linux-x86_64.sh --skip-license --prefix=/usr/local + rm cmake-3.27.9-linux-x86_64.sh # fix luajit paths sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua5.1.a sudo ln -s /usr/include/luajit-2.1 /usr/include/lua diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index cee3a5c5..b5e12570 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -39,7 +39,12 @@ jobs: # make && make install INSTALL_INC=/usr/include/lua run: | sudo apt-get update - sudo apt-get install -y cmake build-essential libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev + sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev wget + # Install CMake >= 3.26 + wget https://github.com/Kitware/CMake/releases/download/v3.27.9/cmake-3.27.9-linux-x86_64.sh + chmod +x cmake-3.27.9-linux-x86_64.sh + sudo ./cmake-3.27.9-linux-x86_64.sh --skip-license --prefix=/usr/local + rm cmake-3.27.9-linux-x86_64.sh # fix luajit paths sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua-5.1.a sudo ln -s /usr/include/luajit-2.1 /usr/include/lua