Merge pull request #1661 from contour-terminal/improvements/static_up…

…date Update and fix static build
contour-terminal · Dec 5, 2024 · 2223111 · 2223111
2 parents 43cd858 + 6d2e84d
commit 2223111
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/.github/static/DockerQt b/.github/static/DockerQt
@@ -1,6 +1,7 @@
 ARG VERSION="24.04"
-FROM ubuntu:$VERSION as builder
+FROM ubuntu:$VERSION AS builder
 ARG ARCH="x86_64"
+ARG QT_VERSION="6.8.1"
 
 RUN apt-get update
 RUN apt-get install -y lsb-release software-properties-common gnupg
@@ -23,10 +24,10 @@ RUN chmod +x llvm.sh
 RUN ./llvm.sh 18
 
 WORKDIR /
-RUN wget -q https://download.qt.io/official_releases/qt/6.8/6.8.0/single/qt-everywhere-src-6.8.0.tar.xz
-RUN tar xf qt-everywhere-src-6.8.0.tar.xz
-RUN rm qt-everywhere-src-6.8.0.tar.xz
-WORKDIR qt-everywhere-src-6.8.0
+RUN wget -q https://download.qt.io/official_releases/qt/6.8/$QT_VERSION/single/qt-everywhere-src-$QT_VERSION.tar.xz
+RUN tar xf qt-everywhere-src-$QT_VERSION.tar.xz
+RUN rm qt-everywhere-src-$QT_VERSION.tar.xz
+WORKDIR qt-everywhere-src-$QT_VERSION
 RUN cmake -S . -B build -G Ninja \
        -D CMAKE_CXX_COMPILER=clang++-18 \
        -D CMAKE_C_COMPILER=clang-18 \

diff --git a/src/vtpty/SshSession.h b/src/vtpty/SshSession.h
@@ -224,3 +224,12 @@ struct std::formatter<vtpty::SshSession::ExitStatus>: std::formatter<std::string
                           status);
     }
 };
+
+template <>
+struct std::formatter<vtpty::SshHostConfig>: std::formatter<std::string>
+{
+    auto format(vtpty::SshHostConfig const& config, auto& ctx) const
+    {
+        return std::formatter<std::string>::format(config.toString(), ctx);
+    }
+};