diff --git a/appveyor.yml b/appveyor.yml index 16931092a..1ffc8a332 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -202,7 +202,7 @@ after_build: # Build the installer - makensis GC3.7-Master-W64-QT5.nsi -- move GoldenCheetah_v3.7-DEV_64bit_Windows.exe ..\..\GoldenCheetah_v3.7-DEV_x64.exe +- move GoldenCheetah_v3.7_64bit_Windows.exe ..\..\GoldenCheetah_v3.7_x64.exe - cd ..\.. - ps: Set-AppveyorBuildVariable -Name 'PUBLISH_BINARIES' -Value false - ps: if ($env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED -Match "\[publish binaries\]") { Set-AppveyorBuildVariable -Name 'PUBLISH_BINARIES' -Value true } @@ -211,11 +211,11 @@ test_script: # minimum test - src\release\GoldenCheetah --version 2>GCversionWindows.txt - git log -1 >> GCversionWindows.txt -- ps: CertUtil -hashfile GoldenCheetah_v3.7-DEV_x64.exe sha256 | Select-Object -First 2 | Add-Content GCversionWindows.txt +- ps: CertUtil -hashfile GoldenCheetah_v3.7_x64.exe sha256 | Select-Object -First 2 | Add-Content GCversionWindows.txt - type GCversionWindows.txt artifacts: -- path: GoldenCheetah_v3.7-DEV_x64.exe +- path: GoldenCheetah_v3.7_x64.exe name: GCinstaller - path: GCversionWindows.txt name: GCversionWindows diff --git a/src/Core/GcUpgrade.h b/src/Core/GcUpgrade.h index 7857b70fd..1da3b89e2 100644 --- a/src/Core/GcUpgrade.h +++ b/src/Core/GcUpgrade.h @@ -110,7 +110,8 @@ // 5001 - V3.7 DEVELOPMENT 2404 (APR 2024) // 5002 - V3.7 DEVELOPMENT 2408 (AUG 2024) // 5003 - V3.7 DEVELOPMENT 2410 (OCT 2024) -// 5004 - V3.7 DEVELOPMENT 2412 (DEC 2024) - latest snapshot 27/3/2025 +// 5004 - V3.7 DEVELOPMENT 2412 (DEC 2024) +// 5005 - V3.7 RELEASE (March 2025) #define VERSION3_BUILD 3010 // released #define VERSION3_SP1 3030 // released @@ -122,14 +123,14 @@ #define VERSION34_BUILD 3955 // released #define VERSION35_BUILD 3990 // released #define VERSION36_BUILD 5000 // released 5/8/23 -#define VERSION37_BUILD 5004 // development release +#define VERSION37_BUILD 5005 // released 28/3/25 // will keep changing during testing and before final release #define VERSION31_BUILD VERSION31_UPG // the next two will with each build/release -#define VERSION_LATEST 5004 -#define VERSION_STRING "V3.7-DEV" +#define VERSION_LATEST 5005 +#define VERSION_STRING "V3.7" #define GC_VERSION VERSION_STRING // To force version string on non-tagged ci builds // default config for this release cycle diff --git a/src/Resources/win32/GC3.7-Master-W64-QT5.nsi b/src/Resources/win32/GC3.7-Master-W64-QT5.nsi index a55166bd1..fd0c348f2 100644 --- a/src/Resources/win32/GC3.7-Master-W64-QT5.nsi +++ b/src/Resources/win32/GC3.7-Master-W64-QT5.nsi @@ -14,7 +14,7 @@ FunctionEnd ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "Golden Cheetah" -!define PRODUCT_VERSION "v3.7-DEV" +!define PRODUCT_VERSION "v3.7" !define PRODUCT_BIT "64" !define PRODUCT_STARTMENU "Golden Cheetah" !define PRODUCT_WEB_SITE_FILENAME "GoldenCheetah WebSite" diff --git a/src/Resources/win32/GC3.7-Master-W64-QT6.nsi b/src/Resources/win32/GC3.7-Master-W64-QT6.nsi index 27dc7e408..3cb493988 100644 --- a/src/Resources/win32/GC3.7-Master-W64-QT6.nsi +++ b/src/Resources/win32/GC3.7-Master-W64-QT6.nsi @@ -14,7 +14,7 @@ FunctionEnd ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "Golden Cheetah" -!define PRODUCT_VERSION "v3.7-DEV" +!define PRODUCT_VERSION "v3.7" !define PRODUCT_BIT "64" !define PRODUCT_STARTMENU "Golden Cheetah" !define PRODUCT_WEB_SITE_FILENAME "GoldenCheetah WebSite" diff --git a/travis/linux/after_success.sh b/travis/linux/after_success.sh index d53850493..1a399e6c4 100755 --- a/travis/linux/after_success.sh +++ b/travis/linux/after_success.sh @@ -72,7 +72,7 @@ then echo "AppImage not generated, check the errors"; exit 1 fi echo "Renaming AppImage file to branch and build number ready for deploy" -export FINAL_NAME=GoldenCheetah_v3.7-DEV_x64.AppImage +export FINAL_NAME=GoldenCheetah_v3.7_x64.AppImage mv GoldenCheetah*.AppImage $FINAL_NAME ls -l $FINAL_NAME diff --git a/travis/osx/after_success.sh b/travis/osx/after_success.sh index 3fae2eddd..d449ef69d 100755 --- a/travis/osx/after_success.sh +++ b/travis/osx/after_success.sh @@ -54,7 +54,7 @@ python3.7 -m pip install travis-wait-improved /Library/Frameworks/Python.framework/Versions/3.7/bin/travis-wait-improved --timeout 30m /usr/local/opt/qt5/bin/macdeployqt GoldenCheetah.app -verbose=2 -fs=hfs+ -dmg echo "Renaming dmg file to branch and build number ready for deploy" -export FINAL_NAME=GoldenCheetah_v3.7-DEV_x64.dmg +export FINAL_NAME=GoldenCheetah_v3.7_x64.dmg mv GoldenCheetah.dmg $FINAL_NAME ls -l $FINAL_NAME