From c959483b80a73842bc695c1c2e3e9f318d0ff021 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Mon, 18 Mar 2024 16:31:32 +0100 Subject: [PATCH 1/6] Update vcpkg to 2024.02.14 https://github.com/microsoft/vcpkg/releases/tag/2024.02.14 --- cmake/vcpkg.cmake | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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", From 12fdf409efd25b14ce9f050b814501d635cca2be Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Tue, 19 Mar 2024 21:08:49 +0100 Subject: [PATCH 2/6] Show vcpkg logs --- .github/workflows/clang-tidy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index b26858d..1d2e062 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -49,6 +49,10 @@ jobs: working-directory: build run: cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .. + - name: Show vcpkg logs + if: always() + run: cat /home/runner/work/ms-pacman/ms-pacman/build/*/vcpkg-manifest-install.log + - name: Run clang-tidy-13 working-directory: build run: run-clang-tidy-13 From 86e31f44aab2d6dbe421eff5bed9761d9b0a5ab4 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Tue, 19 Mar 2024 21:14:44 +0100 Subject: [PATCH 3/6] Show vcpkg logs Clang tidy doesn't have a profile directory --- .github/workflows/clang-tidy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 1d2e062..7a540e4 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -51,7 +51,7 @@ jobs: - name: Show vcpkg logs if: always() - run: cat /home/runner/work/ms-pacman/ms-pacman/build/*/vcpkg-manifest-install.log + run: cat /home/runner/work/ms-pacman/ms-pacman/build/vcpkg-manifest-install.log - name: Run clang-tidy-13 working-directory: build From 754a94ae8d876bb072217c581ce3f75ca9d14b1f Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Tue, 19 Mar 2024 21:23:23 +0100 Subject: [PATCH 4/6] Add in the SFML log --- .github/workflows/clang-tidy.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 7a540e4..e9ec849 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -51,7 +51,10 @@ jobs: - name: Show vcpkg logs if: always() - run: cat /home/runner/work/ms-pacman/ms-pacman/build/vcpkg-manifest-install.log + 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 From ab6782ae593ca8f8169899d802fecf6317b871e1 Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Tue, 19 Mar 2024 21:42:38 +0100 Subject: [PATCH 5/6] Add libxcursor-dev to the dependencies --- .github/workflows/clang-tidy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index e9ec849..eef3d76 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -43,7 +43,7 @@ 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 From 2785131a5bd884ba19318b0bd26b1ab175dcccdb Mon Sep 17 00:00:00 2001 From: Patricia Aas Date: Tue, 19 Mar 2024 21:56:25 +0100 Subject: [PATCH 6/6] Add libxcursor-dev to the dependencies for the cmake workflow aswell --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'