From 46c3121e13c7455c84e05669c7e9f8938cd3a998 Mon Sep 17 00:00:00 2001
From: fdr400 <fdr400@yandex-team.com>
Date: Wed, 8 Jan 2025 12:36:04 +0300
Subject: [PATCH] correct cache keys

---
 .github/workflows/alpine.yml  | 2 +-
 .github/workflows/ci.yml      | 2 +-
 .github/workflows/docker.yaml | 2 +-
 .github/workflows/macos.yml   | 2 +-
 cmake/ModuleHelpers.cmake     | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
index 3f3ea1ec5086..b5b002062b43 100644
--- a/.github/workflows/alpine.yml
+++ b/.github/workflows/alpine.yml
@@ -37,7 +37,7 @@ jobs:
                 path: |
                     ${{env.CCACHE_DIR}}
                     ${{env.CPM_SOURCE_CACHE}}
-                key: 'alpine-cache-dir ${{github.ref}}'
+                key: 'alpine-cache-dir ${{github.ref}} run-${{github.run_number}}'
                 restore-keys: |
                     alpine-cache-dir ${{github.ref}}
                     alpine-cache-dir
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 263ea7a4eb55..bafb6929be9c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -113,7 +113,7 @@ jobs:
                 path: |
                     ${{env.CCACHE_DIR}}
                     ${{env.CPM_SOURCE_CACHE}}
-                key: 'ubuntu-cache-dir ${{matrix.id}} ${{github.ref}}'
+                key: 'ubuntu-cache-dir ${{matrix.id}} ${{github.ref}} run-${{github.run_number}}'
                 restore-keys: |
                     ubuntu-cache-dir ${{matrix.id}} ${{github.ref}}
                     ubuntu-cache-dir ${{matrix.id}}
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 9c64a92ea53a..c190f565d89e 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -100,7 +100,7 @@ jobs:
                 path: |
                     .ccache
                     .cache/CPM
-                key: 'docker-cache-dir ${{matrix.id}} ${{github.ref}}'
+                key: 'docker-cache-dir ${{matrix.id}} ${{github.ref}} run-${{github.run_number}}'
                 restore-keys: |
                     docker-cache-dir ${{matrix.id}} ${{github.ref}}
                     docker-cache-dir ${{matrix.id}}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 92e01b4ea52f..e5dba6c5fde4 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -49,7 +49,7 @@ jobs:
                 path: |
                     ${{env.CCACHE_DIR}}
                     ${{env.CPM_SOURCE_CACHE}}
-                key: 'macos-cache-dir ${{github.ref}}'
+                key: 'macos-cache-dir ${{github.ref}} run-${{github.run_number}}'
                 restore-keys: |
                     macos-cache-dir ${{github.ref}}
                     macos-cache-dir
diff --git a/cmake/ModuleHelpers.cmake b/cmake/ModuleHelpers.cmake
index 82a24d67f8f6..15266836e0a9 100644
--- a/cmake/ModuleHelpers.cmake
+++ b/cmake/ModuleHelpers.cmake
@@ -7,7 +7,6 @@ macro(_userver_module_begin)
   set(oneValueArgs
       # Target name, also used for package name by default
       NAME
-      # For multi-target packages
       VERSION
   )
   set(multiValueArgs