From 78f4620b96bc4408f7f7a9b2aa4e1041a119c2ac Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Fri, 5 Sep 2025 20:56:13 +0200 Subject: [PATCH] ci: Fix ccache version for PR workflows --- cmake/CcacheVersion.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/CcacheVersion.cmake b/cmake/CcacheVersion.cmake index f9541e42..111d5c66 100644 --- a/cmake/CcacheVersion.cmake +++ b/cmake/CcacheVersion.cmake @@ -43,7 +43,11 @@ elseif(DEFINED ENV{GITHUB_REF}) set(CCACHE_VERSION "${CMAKE_MATCH_1}") else() string(SUBSTRING "$ENV{GITHUB_SHA}" 0 8 hash) - set(CCACHE_VERSION "$ENV{GITHUB_REF_NAME}.${hash}") + if("$ENV{GITHUB_REF}" MATCHES "^refs/pull/(.+)/merge$") + set(CCACHE_VERSION "pr.${CMAKE_MATCH_1}.${hash}") + else() + set(CCACHE_VERSION "$ENV{GITHUB_REF_NAME}.${hash}") + endif() endif() elseif(EXISTS "${CMAKE_SOURCE_DIR}/.git") # Scenario 4. -- 2.47.3