From 8aac3b94e8c6f866b87b73e61f9ab26f55ab500b Mon Sep 17 00:00:00 2001 From: John Michael Burke Date: Fri, 11 Feb 2022 14:38:13 -0800 Subject: [PATCH] Allow release format vX.X.X. --- .github/workflows/main.yml | 1 + installers/Windows/Installer.nsi | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d72ba5477..0741c14a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,6 +6,7 @@ on: - 'main' tags: - '[0-9]+.[0-9]+.[0-9]+*' + - 'v[0-9]+.[0-9]+.[0-9]+*' pull_request: env: diff --git a/installers/Windows/Installer.nsi b/installers/Windows/Installer.nsi index c260b7bb0..e22e60e66 100644 --- a/installers/Windows/Installer.nsi +++ b/installers/Windows/Installer.nsi @@ -11,7 +11,9 @@ Unicode true !define MUI_ICON "..\..\resources\images\icon.ico" !define MUI_UNICON "..\..\resources\images\icon.ico" -!searchparse /file "..\..\console_backend\src\version.txt" `` VER_MAJOR `.` VER_MINOR `.` VER_PATCH_UNFILTERED `` +!searchparse /file "..\..\console_backend\src\version.txt" `` VER_MAJOR_UNFILTERED `.` \ + VER_MINOR `.` VER_PATCH_UNFILTERED `` +!searchreplace VER_MAJOR ${VER_MAJOR_UNFILTERED} "v" "" !searchparse /noerrors "${VER_PATCH_UNFILTERED}" `` VER_PATCH `-` !define VERSION_ORIGINAL "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH_UNFILTERED}" !define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}.0"