From 8ff7e4d5a33215a8ecd55efa088194439caff1e3 Mon Sep 17 00:00:00 2001
From: SidorovichPavel <sidorovich.pasha@gmail.com>
Date: Wed, 6 Nov 2024 19:38:43 +0300
Subject: [PATCH 1/2] fix build fmt11

---
 .../src/storages/clickhouse/impl/native_client_factory.cpp  | 3 +++
 clickhouse/src/storages/clickhouse/impl/settings.cpp        | 1 +
 mongo/src/storages/mongo/mongo_secdist.cpp                  | 3 +++
 .../functional_tests/basic_chaos/postgres_service.cpp       | 3 +++
 postgresql/functional_tests/metrics/service.cpp             | 3 +++
 postgresql/src/storages/postgres/detail/result_wrapper.cpp  | 1 +
 postgresql/src/storages/postgres/dist_lock_strategy.cpp     | 6 ++++--
 postgresql/src/storages/postgres/dsn.cpp                    | 2 +-
 postgresql/src/storages/postgres/io/buffer_io.cpp           | 1 +
 postgresql/src/storages/postgres/postgres_secdist.cpp       | 3 +++
 rabbitmq/src/urabbitmq/client_settings.cpp                  | 1 +
 samples/clickhouse_service/clickhouse_service.cpp           | 3 +++
 12 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/clickhouse/src/storages/clickhouse/impl/native_client_factory.cpp b/clickhouse/src/storages/clickhouse/impl/native_client_factory.cpp
index 81fc014f5caa..0ef2b12906ec 100644
--- a/clickhouse/src/storages/clickhouse/impl/native_client_factory.cpp
+++ b/clickhouse/src/storages/clickhouse/impl/native_client_factory.cpp
@@ -17,6 +17,9 @@
 
 #include <storages/clickhouse/impl/tracing_tags.hpp>
 
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
 namespace clickhouse {
 // Not present before 2.5.0, but we don't use it anyway.
 struct Endpoint;
diff --git a/clickhouse/src/storages/clickhouse/impl/settings.cpp b/clickhouse/src/storages/clickhouse/impl/settings.cpp
index 0bfc6d0b75f4..236d2acc0591 100644
--- a/clickhouse/src/storages/clickhouse/impl/settings.cpp
+++ b/clickhouse/src/storages/clickhouse/impl/settings.cpp
@@ -11,6 +11,7 @@
 #include <boost/range/adaptor/map.hpp>
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 
 USERVER_NAMESPACE_BEGIN
 
diff --git a/mongo/src/storages/mongo/mongo_secdist.cpp b/mongo/src/storages/mongo/mongo_secdist.cpp
index f6df7165773c..9759cc73799e 100644
--- a/mongo/src/storages/mongo/mongo_secdist.cpp
+++ b/mongo/src/storages/mongo/mongo_secdist.cpp
@@ -9,6 +9,9 @@
 
 #include <boost/range/adaptor/map.hpp>
 
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
 USERVER_NAMESPACE_BEGIN
 
 namespace storages::mongo::secdist {
diff --git a/postgresql/functional_tests/basic_chaos/postgres_service.cpp b/postgresql/functional_tests/basic_chaos/postgres_service.cpp
index f37bd02c58fd..cb77c9bf0f0f 100644
--- a/postgresql/functional_tests/basic_chaos/postgres_service.cpp
+++ b/postgresql/functional_tests/basic_chaos/postgres_service.cpp
@@ -18,6 +18,9 @@
 #include <userver/storages/postgres/cluster.hpp>
 #include <userver/storages/postgres/component.hpp>
 
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
 namespace chaos {
 
 constexpr std::string_view kSelectSmallTimeout = "select-small-timeout";
diff --git a/postgresql/functional_tests/metrics/service.cpp b/postgresql/functional_tests/metrics/service.cpp
index aa6aabed0a1a..cdd594fad33b 100644
--- a/postgresql/functional_tests/metrics/service.cpp
+++ b/postgresql/functional_tests/metrics/service.cpp
@@ -17,6 +17,9 @@
 
 #include <userver/cache/base_postgres_cache.hpp>
 
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
 namespace pg::metrics {
 
 struct KeyValue {
diff --git a/postgresql/src/storages/postgres/detail/result_wrapper.cpp b/postgresql/src/storages/postgres/detail/result_wrapper.cpp
index b564b27882c0..d90d3521fb2c 100644
--- a/postgresql/src/storages/postgres/detail/result_wrapper.cpp
+++ b/postgresql/src/storages/postgres/detail/result_wrapper.cpp
@@ -2,6 +2,7 @@
 
 #include <fmt/compile.h>
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 #include <boost/container/small_vector.hpp>
 #include <boost/stacktrace/stacktrace.hpp>
 
diff --git a/postgresql/src/storages/postgres/dist_lock_strategy.cpp b/postgresql/src/storages/postgres/dist_lock_strategy.cpp
index 79f3ceea185b..c57ea6b441e1 100644
--- a/postgresql/src/storages/postgres/dist_lock_strategy.cpp
+++ b/postgresql/src/storages/postgres/dist_lock_strategy.cpp
@@ -1,5 +1,7 @@
 #include <userver/storages/postgres/dist_lock_strategy.hpp>
 
+#include <string_view>
+
 #include <fmt/compile.h>
 #include <fmt/format.h>
 
@@ -16,7 +18,7 @@ namespace {
 // owner - $2
 // timeout in seconds - $3
 std::string MakeAcquireQuery(const std::string& table) {
-    static constexpr auto kAcquireQueryFmt = R"(
+    static constexpr std::string_view kAcquireQueryFmt = R"(
     INSERT INTO {} AS t (key, owner, expiration_time) VALUES
     ($1, $2, current_timestamp + make_interval(secs => $3))
     ON CONFLICT (key) DO UPDATE
@@ -30,7 +32,7 @@ std::string MakeAcquireQuery(const std::string& table) {
 // key - $1
 // owner - $2
 std::string MakeReleaseQuery(const std::string& table) {
-    static constexpr auto kReleaseQueryFmt = R"(
+    static constexpr std::string_view kReleaseQueryFmt = R"(
     DELETE FROM {}
     WHERE key = $1
     AND owner = $2
diff --git a/postgresql/src/storages/postgres/dsn.cpp b/postgresql/src/storages/postgres/dsn.cpp
index f240db64a916..110505e40d29 100644
--- a/postgresql/src/storages/postgres/dsn.cpp
+++ b/postgresql/src/storages/postgres/dsn.cpp
@@ -3,12 +3,12 @@
 #include <algorithm>
 #include <array>
 #include <cstring>
-#include <iostream>
 #include <map>
 #include <memory>
 #include <sstream>
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 #include <libpq-fe.h>
 
 #include <userver/clients/dns/resolver.hpp>
diff --git a/postgresql/src/storages/postgres/io/buffer_io.cpp b/postgresql/src/storages/postgres/io/buffer_io.cpp
index e90620f9add5..948bcc3848b4 100644
--- a/postgresql/src/storages/postgres/io/buffer_io.cpp
+++ b/postgresql/src/storages/postgres/io/buffer_io.cpp
@@ -6,6 +6,7 @@
 #include <unordered_map>
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 
 #include <userver/compiler/demangle.hpp>
 #include <userver/logging/log.hpp>
diff --git a/postgresql/src/storages/postgres/postgres_secdist.cpp b/postgresql/src/storages/postgres/postgres_secdist.cpp
index 8411b9829620..a0998c47eb53 100644
--- a/postgresql/src/storages/postgres/postgres_secdist.cpp
+++ b/postgresql/src/storages/postgres/postgres_secdist.cpp
@@ -9,6 +9,9 @@
 
 #include <boost/range/adaptor/map.hpp>
 
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
 USERVER_NAMESPACE_BEGIN
 
 namespace storages::postgres::secdist {
diff --git a/rabbitmq/src/urabbitmq/client_settings.cpp b/rabbitmq/src/urabbitmq/client_settings.cpp
index 35d7dc625449..466737ff8d15 100644
--- a/rabbitmq/src/urabbitmq/client_settings.cpp
+++ b/rabbitmq/src/urabbitmq/client_settings.cpp
@@ -16,6 +16,7 @@
 #include <boost/range/adaptor/map.hpp>
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 
 USERVER_NAMESPACE_BEGIN
 
diff --git a/samples/clickhouse_service/clickhouse_service.cpp b/samples/clickhouse_service/clickhouse_service.cpp
index 4e2d76b4bdba..f167d51807d0 100644
--- a/samples/clickhouse_service/clickhouse_service.cpp
+++ b/samples/clickhouse_service/clickhouse_service.cpp
@@ -19,6 +19,9 @@
 
 #include <userver/utils/daemon_run.hpp>
 
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
 namespace samples::clickhouse {
 
 struct Result {

From e76b81ae065caa3f256cd282986ce6de04abf61e Mon Sep 17 00:00:00 2001
From: SidorovichPavel <sidorovich.pasha@gmail.com>
Date: Thu, 7 Nov 2024 01:12:36 +0300
Subject: [PATCH 2/2] fix CI ccache

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 38b32177dce5..af2c66232d39 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,7 +86,7 @@ jobs:
           - name: Reuse ccache directory
             uses: actions/cache@v4
             with:
-                path: ~/.ccache
+                path: ~/.cache/ccache
                 key: '${{matrix.os}} ${{matrix.info}} ccache-dir ${{github.ref}} run-${{github.run_number}}'
                 restore-keys: |
                     ${{matrix.os}} ${{matrix.info}} ccache-dir ${{github.ref}} run-'