Merge pull request #23 from contour-terminal/stdlib

drop fmt from vcpkg.json
contour-terminal · Oct 4, 2024 · 22a0c42 · 22a0c42
2 parents 96c6bb7 + f6c3798
commit 22a0c42
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git 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:
 
@@ -45,16 +45,16 @@ 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:
     - uses: actions/checkout@v3
     - 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 13"
-      run: sudo apt install g++-13
+    - name: "Install GCC"
+      run: sudo apt install g++
     - name: "cmake"
-      run: cmake --preset "$CMAKE_PRESET" -D CMAKE_CXX_COMPILER="g++-13"
+      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-ubuntu24.04-amd64.deb
     - name: "create and patch contour.yml config file"
       run: |
         set -ex

diff --git 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
@@ -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;
 }
 

diff --git a/scripts/xvfb-deps.sh b/scripts/xvfb-deps.sh
@@ -25,17 +25,18 @@ packages="
             xvfb \
             \
             ffmpeg \
-            libavcodec58 \
-            libavdevice58 \
-            libavformat58 \
-            libavutil56 \
+            libavcodec60 \
+            libavdevice60 \
+            libavformat60 \
+            libavutil58 \
             libdeflate0 \
             libncurses6 \
             libqrcodegen1 \
-            libswscale5 \
-            libunistring2 \
+            libswscale7 \
+            libunistring5 \
             \
             libfontconfig1 \
+            libfontconfig1-dev \
             libfreetype6 \
             libharfbuzz0b \
             \
@@ -58,9 +59,11 @@ packages="
             qtquickcontrols2-5-dev \
             \
             libutempter0 \
-            libyaml-cpp0.7\
+            libyaml-cpp0.8\
             \
-            cargo
+            cargo\
+	    pkg-config \
+	    librust-pkg-config-dev
 "
 
 sudo apt install -y $packages
diff --git 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"
     ]
 }