From 2df5e4b60e89895bae86106c07086db8ed2ca40d Mon Sep 17 00:00:00 2001 From: Christian Parpart Date: Mon, 23 Sep 2024 20:38:16 +0200 Subject: [PATCH 1/6] drop fmt from vcpkg.json Signed-off-by: Christian Parpart --- vcpkg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index a1c6752..b74b1a2 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "dependencies": [ - "catch2", - "fmt" + "catch2" ] } From 927b1d73ebde7a1010ea243e50d7954d98141176 Mon Sep 17 00:00:00 2001 From: Yaraslau Tamashevich Date: Mon, 23 Sep 2024 23:45:01 +0300 Subject: [PATCH 2/6] update gcc version inside build action --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03a5caf..04ae63a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,10 +67,10 @@ jobs: sudo apt -q update sudo apt install -qy ninja-build sudo ./scripts/install-deps.sh - - name: "Install GCC 13" - run: sudo apt install g++-13 + - name: "Install GCC 12" + run: sudo apt install g++-12 - name: "cmake" - run: cmake --preset "$CMAKE_PRESET" -D CMAKE_CXX_COMPILER="g++-13" + run: cmake --preset "$CMAKE_PRESET" -D CMAKE_CXX_COMPILER="g++-12" - name: "build" run: cmake --build --preset "$CMAKE_PRESET" --preset -- -j3 - name: "install dependencies for running benchmarks" From 5868cd7f64a1ed4ce57547591e720296b6993d33 Mon Sep 17 00:00:00 2001 From: Yaraslau Tamashevich Date: Tue, 24 Sep 2024 10:35:51 +0300 Subject: [PATCH 3/6] Update ubuntu version for github build --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04ae63a..099028d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,8 +45,8 @@ jobs: run: ./scripts/check-includes.sh ubuntu_linux: - name: "Ubuntu Linux 22.04" - runs-on: ubuntu-22.04 + name: "Ubuntu Linux 24.04" + runs-on: ubuntu-24.04 env: CMAKE_PRESET: "linux-gcc-release" steps: @@ -54,7 +54,7 @@ jobs: - name: ccache uses: hendrikmuhs/ccache-action@v1 with: - key: "ccache-ubuntu_2204" + key: "ccache-ubuntu_2404" max-size: 256M - name: set environment variables id: set_vars @@ -67,18 +67,18 @@ jobs: sudo apt -q update sudo apt install -qy ninja-build sudo ./scripts/install-deps.sh - - name: "Install GCC 12" - run: sudo apt install g++-12 + - name: "Install GCC" + run: sudo apt install g++ - name: "cmake" - run: cmake --preset "$CMAKE_PRESET" -D CMAKE_CXX_COMPILER="g++-12" + run: cmake --preset "$CMAKE_PRESET" -D CMAKE_CXX_COMPILER="g++" - name: "build" run: cmake --build --preset "$CMAKE_PRESET" --preset -- -j3 - name: "install dependencies for running benchmarks" run: ./scripts/xvfb-deps.sh - name: "Install contour" run: | - wget https://github.com/contour-terminal/contour/releases/download/v$CONTOUR_VERSION/contour-$CONTOUR_VERSION-ubuntu22.04-amd64.deb - sudo dpkg -i contour-$CONTOUR_VERSION-ubuntu22.04-amd64.deb + wget https://github.com/contour-terminal/contour/releases/download/v$CONTOUR_VERSION/contour-$CONTOUR_VERSION-ubuntu24.04-amd64.deb + sudo dpkg -i contour-$CONTOUR_VERSION-ubuntu25.04-amd64.deb - name: "create and patch contour.yml config file" run: | set -ex From 65cb76735effe118d5f29e25f744ac9568270791 Mon Sep 17 00:00:00 2001 From: Yaraslau Tamashevich Date: Tue, 24 Sep 2024 11:13:45 +0300 Subject: [PATCH 4/6] Update Glaze api --- CMakeLists.txt | 2 +- libtermbench/termbench.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc008ac..6948010 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ include(FetchContent) FetchContent_Declare( glaze GIT_REPOSITORY https://github.com/stephenberry/glaze.git - GIT_TAG main + GIT_TAG v3.4.2 GIT_SHALLOW TRUE ) FetchContent_MakeAvailable(glaze) diff --git a/libtermbench/termbench.cpp b/libtermbench/termbench.cpp index 9f30fdc..136d2c2 100644 --- a/libtermbench/termbench.cpp +++ b/libtermbench/termbench.cpp @@ -106,7 +106,7 @@ void Benchmark::runAll() void Benchmark::summarizeToJson(std::ostream& os) { - std::string buffer = glz::write_json(results_); + std::string buffer = glz::write_json(results_).value_or("error"); os << buffer; } From 1f94d9a24304c2947f5ea8ea6020cb63a917c3b9 Mon Sep 17 00:00:00 2001 From: Yaraslau Tamashevich Date: Tue, 24 Sep 2024 11:17:47 +0300 Subject: [PATCH 5/6] Update deps for ubuntu 24.04 --- scripts/xvfb-deps.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/xvfb-deps.sh b/scripts/xvfb-deps.sh index 45ca102..8409ece 100755 --- a/scripts/xvfb-deps.sh +++ b/scripts/xvfb-deps.sh @@ -25,15 +25,15 @@ packages=" xvfb \ \ ffmpeg \ - libavcodec58 \ - libavdevice58 \ - libavformat58 \ - libavutil56 \ + libavcodec60 \ + libavdevice60 \ + libavformat60 \ + libavutil58 \ libdeflate0 \ libncurses6 \ libqrcodegen1 \ - libswscale5 \ - libunistring2 \ + libswscale7 \ + libunistring5 \ \ libfontconfig1 \ libfreetype6 \ @@ -58,7 +58,7 @@ packages=" qtquickcontrols2-5-dev \ \ libutempter0 \ - libyaml-cpp0.7\ + libyaml-cpp0.8\ \ cargo " From f6c37988e6481b48a8b8acaf1575495e018e9747 Mon Sep 17 00:00:00 2001 From: Yaraslau Tamashevich Date: Tue, 24 Sep 2024 11:20:25 +0300 Subject: [PATCH 6/6] Update contour version --- .github/workflows/build.yml | 4 ++-- scripts/xvfb-deps.sh | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 099028d..904f278 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ concurrency: env: CTEST_OUTPUT_ON_FAILURE: 1 - CONTOUR_VERSION: "0.4.3.6442" + CONTOUR_VERSION: "0.5.0.7168" jobs: @@ -78,7 +78,7 @@ jobs: - name: "Install contour" run: | wget https://github.com/contour-terminal/contour/releases/download/v$CONTOUR_VERSION/contour-$CONTOUR_VERSION-ubuntu24.04-amd64.deb - sudo dpkg -i contour-$CONTOUR_VERSION-ubuntu25.04-amd64.deb + sudo dpkg -i contour-$CONTOUR_VERSION-ubuntu24.04-amd64.deb - name: "create and patch contour.yml config file" run: | set -ex diff --git a/scripts/xvfb-deps.sh b/scripts/xvfb-deps.sh index 8409ece..66b5a27 100755 --- a/scripts/xvfb-deps.sh +++ b/scripts/xvfb-deps.sh @@ -36,6 +36,7 @@ packages=" libunistring5 \ \ libfontconfig1 \ + libfontconfig1-dev \ libfreetype6 \ libharfbuzz0b \ \ @@ -60,7 +61,9 @@ packages=" libutempter0 \ libyaml-cpp0.8\ \ - cargo + cargo\ + pkg-config \ + librust-pkg-config-dev " sudo apt install -y $packages