diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index b26858d..eef3d76 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -43,12 +43,19 @@ jobs: - name: Install Build dependencies run: | sudo apt update -y - sudo apt-get install -y libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libudev-dev make ninja-build cmake + sudo apt-get install -y libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libudev-dev libxcursor-dev make ninja-build cmake - name: Configure CMake working-directory: build run: cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .. + - name: Show vcpkg logs + if: always() + shell: bash + run: | + cat /home/runner/work/ms-pacman/ms-pacman/build/vcpkg-manifest-install.log + cat /home/runner/work/ms-pacman/ms-pacman/build/_deps/vcpkg-src/buildtrees/sfml/install-x64-linux-dbg-out.log + - name: Run clang-tidy-13 working-directory: build run: run-clang-tidy-13 diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index d3c86ff..815faad 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -101,7 +101,7 @@ jobs: - name: Install Linux dependencies if: startsWith( matrix.configurations.os, 'ubuntu-' ) - run: sudo apt-get update && sudo apt-get install -y libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev libudev-dev clang-12 make ninja-build cmake autoconf libtool mesa-common-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev + run: sudo apt-get update && sudo apt-get install -y libx11-dev libxcursor-dev libxi-dev libxrandr-dev libgl1-mesa-dev libudev-dev clang-12 make ninja-build cmake autoconf libtool mesa-common-dev libglu1-mesa-dev libfreetype6-dev libopenal-dev libsndfile1-dev - name: Install Additional Linux dependencies if: matrix.configurations.config-preset == 'linux-gcc-11' diff --git a/cmake/vcpkg.cmake b/cmake/vcpkg.cmake index 6351343..10fed20 100644 --- a/cmake/vcpkg.cmake +++ b/cmake/vcpkg.cmake @@ -2,7 +2,7 @@ include(FetchContent) FetchContent_Declare( vcpkg GIT_REPOSITORY https://github.com/microsoft/vcpkg - GIT_TAG 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1 # 2023.04.15 + GIT_TAG fba75d09065fcc76a25dcf386b1d00d33f5175af # 2024.02.14 ) if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) diff --git a/vcpkg.json b/vcpkg.json index a91e1f7..64aa3a8 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "ms-pacman", "version": "1.0", - "builtin-baseline": "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1", + "builtin-baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af", "dependencies": [ "sfml", "fmt",