From 7d40a0b6674c89967a9f7f5a30124343694b3668 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 9 Jun 2026 17:39:48 +0200 Subject: [PATCH 1/2] Fix version number and git origin --- cmake/YosysVersion.cmake | 2 +- cmake/YosysVersionData.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/YosysVersion.cmake b/cmake/YosysVersion.cmake index 2e231445c..125a87615 100644 --- a/cmake/YosysVersion.cmake +++ b/cmake/YosysVersion.cmake @@ -107,7 +107,7 @@ function(yosys_extract_version) # Build YOSYS_ORIGIN_INFO (git repository origin and branch) if (git_origin AND git_branch) string(REGEX REPLACE "^https://|.git$" "" git_origin ${git_origin}) - if (git_origin STREQUAL "github.com/YosysHQ/yosys" AND git_branch MATCHES "^HEAD|main|release/v.+$") + if (git_origin MATCHES "github\\.com[:/]YosysHQ/yosys$" AND git_branch MATCHES "^HEAD|main|release/v.+$") # Nothing to highlight. set(YOSYS_ORIGIN_INFO "") else() diff --git a/cmake/YosysVersionData.cmake b/cmake/YosysVersionData.cmake index 4eb20ce5d..11ba96174 100644 --- a/cmake/YosysVersionData.cmake +++ b/cmake/YosysVersionData.cmake @@ -1,2 +1,2 @@ set(YOSYS_VERSION_MAJOR 0) -set(YOSYS_VERSION_MINOR 64) +set(YOSYS_VERSION_MINOR 66) From 160a4e5dfc7f4388d9216d73d2f3c6c0038ed40b Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 9 Jun 2026 18:20:17 +0200 Subject: [PATCH 2/2] For release branch always keep distance zero --- cmake/YosysVersion.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/YosysVersion.cmake b/cmake/YosysVersion.cmake index 125a87615..da7aa0aab 100644 --- a/cmake/YosysVersion.cmake +++ b/cmake/YosysVersion.cmake @@ -70,6 +70,9 @@ function(yosys_extract_version) # Build YOSYS_VERSION (just the version info). set(YOSYS_VERSION "${YOSYS_VERSION_MAJOR}.${YOSYS_VERSION_MINOR}") + if (git_branch MATCHES "^release/v.+$") + set(git_distance 0) + endif() if (git_distance STREQUAL "") string(APPEND YOSYS_VERSION "+post") else()