From 077cf854451cd287df6f0be6bf3c1ed881c64277 Mon Sep 17 00:00:00 2001 From: James Date: Sun, 12 Jan 2025 19:31:38 -0600 Subject: [PATCH 1/6] Version 3.2 is alive! --- cmake/AutoRevision.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/AutoRevision.txt b/cmake/AutoRevision.txt index f1c07874b4..15a7740ef4 100644 --- a/cmake/AutoRevision.txt +++ b/cmake/AutoRevision.txt @@ -1,2 +1,2 @@ -0fe9f -v3.1-rc.1 +f5ed3 +v3.2-dev.0 From f071ee58e176fefc0bb56db85550b0ceae6da91b Mon Sep 17 00:00:00 2001 From: James Date: Sun, 12 Jan 2025 19:59:47 -0600 Subject: [PATCH 2/6] update rev tag --- cmake/AutoRevision.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/AutoRevision.txt b/cmake/AutoRevision.txt index 15a7740ef4..0e264ddd98 100644 --- a/cmake/AutoRevision.txt +++ b/cmake/AutoRevision.txt @@ -1,2 +1,2 @@ f5ed3 -v3.2-dev.0 +v3.2-dev From e433b0e449e10ccafbc0822cfb3e681238e2b472 Mon Sep 17 00:00:00 2001 From: James Date: Sun, 12 Jan 2025 20:08:34 -0600 Subject: [PATCH 3/6] dev.1 --- cmake/AutoRevision.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/AutoRevision.txt b/cmake/AutoRevision.txt index 0e264ddd98..7da8483933 100644 --- a/cmake/AutoRevision.txt +++ b/cmake/AutoRevision.txt @@ -1,2 +1,2 @@ f5ed3 -v3.2-dev +v3.2-dev.1 From 49deed133d760cb0516bb50c88e15b4c0b2e891a Mon Sep 17 00:00:00 2001 From: James Date: Mon, 13 Jan 2025 12:13:56 -0600 Subject: [PATCH 4/6] Fix regex to follow release process --- cmake/AutoRevision.cmake | 2 +- cmake/AutoRevision.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/AutoRevision.cmake b/cmake/AutoRevision.cmake index abae693070..105ec7b81d 100644 --- a/cmake/AutoRevision.cmake +++ b/cmake/AutoRevision.cmake @@ -75,7 +75,7 @@ message(STATUS "Version tag: ${FC21_REV_TAG}") # v3.0 # v3.0.1 if (NOT "${FC21_REV_TAG}" - MATCHES "^v[0-9]+\.[0-9]+(\.[0-9]+)?(-((((alpha)|(beta)|(rc))\.[0-9]+)|(dev)))?$") + MATCHES "^v[0-9]+\.[0-9]+\-?((alpha)|(beta)|(rc)|(dev))+\.[0-9]?$") message(SEND_ERROR "The version tag '${FC21_REV_TAG}' does not follow the expected format.") endif() diff --git a/cmake/AutoRevision.txt b/cmake/AutoRevision.txt index 7da8483933..15a7740ef4 100644 --- a/cmake/AutoRevision.txt +++ b/cmake/AutoRevision.txt @@ -1,2 +1,2 @@ f5ed3 -v3.2-dev.1 +v3.2-dev.0 From a0f71a025d0fff322ee9c0f8a1b1304bbdf8a2a8 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 15 Jan 2025 11:38:08 -0600 Subject: [PATCH 5/6] Add support for patch to version regex --- cmake/AutoRevision.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/AutoRevision.cmake b/cmake/AutoRevision.cmake index 105ec7b81d..335e8b2f74 100644 --- a/cmake/AutoRevision.cmake +++ b/cmake/AutoRevision.cmake @@ -75,7 +75,7 @@ message(STATUS "Version tag: ${FC21_REV_TAG}") # v3.0 # v3.0.1 if (NOT "${FC21_REV_TAG}" - MATCHES "^v[0-9]+\.[0-9]+\-?((alpha)|(beta)|(rc)|(dev))+\.[0-9]?$") + MATCHES "^v[0-9]+\.[0-9]+\-?((dev)|(alpha)|(beta)|(rc)|(patch))+\.[0-9]?$") message(SEND_ERROR "The version tag '${FC21_REV_TAG}' does not follow the expected format.") endif() From 2c5e3dbf8292b52a69bf71afc013d4602edaeb35 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 20 Jan 2025 15:05:34 -0600 Subject: [PATCH 6/6] Final regex change --- cmake/AutoRevision.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/AutoRevision.cmake b/cmake/AutoRevision.cmake index 335e8b2f74..6decc6994d 100644 --- a/cmake/AutoRevision.cmake +++ b/cmake/AutoRevision.cmake @@ -72,10 +72,11 @@ message(STATUS "Version tag: ${FC21_REV_TAG}") # v3.0-alpha.1 # v3.0-beta.1 # v3.0-rc.1 +# v3.0-patch.1 # v3.0 # v3.0.1 if (NOT "${FC21_REV_TAG}" - MATCHES "^v[0-9]+\.[0-9]+\-?((dev)|(alpha)|(beta)|(rc)|(patch))+\.[0-9]?$") + MATCHES "v[0-9]+\.[0-9]+(\.[0-9]+)?(-((dev)|(alpha)|(beta)|(rc)|(patch))\.[0-9]+)?$") message(SEND_ERROR "The version tag '${FC21_REV_TAG}' does not follow the expected format.") endif()