mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-04-15 05:32:21 +00:00
Version 3.7 - Development Build April 2024
First development build after v3.6 release. [Publish Binaries]
This commit is contained in:
10
appveyor.yml
10
appveyor.yml
@@ -190,11 +190,11 @@ after_build:
|
|||||||
- copy ..\Resources\win32\gc.ico
|
- copy ..\Resources\win32\gc.ico
|
||||||
|
|
||||||
# Installer script
|
# Installer script
|
||||||
- copy ..\Resources\win32\GC3.6-Master-W64-QT5.nsi
|
- copy ..\Resources\win32\GC3.7-Master-W64-QT5.nsi
|
||||||
|
|
||||||
# Build the installer
|
# Build the installer
|
||||||
- makensis GC3.6-Master-W64-QT5.nsi
|
- makensis GC3.7-Master-W64-QT5.nsi
|
||||||
- move GoldenCheetah_v3.6_64bit_Windows.exe ..\..\GoldenCheetah_v3.6_x64.exe
|
- move GoldenCheetah_v3.7_DEV_64bit_Windows.exe ..\..\GoldenCheetah_v3.7-DEV_x64.exe
|
||||||
- cd ..\..
|
- cd ..\..
|
||||||
- ps: Set-AppveyorBuildVariable -Name 'PUBLISH_BINARIES' -Value false
|
- 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 }
|
- ps: if ($env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED -Match "\[publish binaries\]") { Set-AppveyorBuildVariable -Name 'PUBLISH_BINARIES' -Value true }
|
||||||
@@ -203,11 +203,11 @@ test_script:
|
|||||||
# minimum test
|
# minimum test
|
||||||
- src\release\GoldenCheetah --version 2>GCversionWindows.txt
|
- src\release\GoldenCheetah --version 2>GCversionWindows.txt
|
||||||
- git log -1 >> GCversionWindows.txt
|
- git log -1 >> GCversionWindows.txt
|
||||||
- ps: CertUtil -hashfile GoldenCheetah_v3.6_x64.exe sha256 | Select-Object -First 2 | Add-Content GCversionWindows.txt
|
- ps: CertUtil -hashfile GoldenCheetah_v3.7-DEV_x64.exe sha256 | Select-Object -First 2 | Add-Content GCversionWindows.txt
|
||||||
- type GCversionWindows.txt
|
- type GCversionWindows.txt
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: GoldenCheetah_v3.6_x64.exe
|
- path: GoldenCheetah_v3.7-DEV_x64.exe
|
||||||
name: GCinstaller
|
name: GCinstaller
|
||||||
- path: GCversionWindows.txt
|
- path: GCversionWindows.txt
|
||||||
name: GCversionWindows
|
name: GCversionWindows
|
||||||
|
|||||||
@@ -106,8 +106,8 @@
|
|||||||
// 4011 - V3.6 DEVELOPMENT 2208 (AUG 2022) (Pre-release RC2)
|
// 4011 - V3.6 DEVELOPMENT 2208 (AUG 2022) (Pre-release RC2)
|
||||||
// 4012 - V3.6 DEVELOPMENT 2210 (OCT 2022) (Pre-release RC3)
|
// 4012 - V3.6 DEVELOPMENT 2210 (OCT 2022) (Pre-release RC3)
|
||||||
// 4013 - V3.6 DEVELOPMENT 2303 (MAR 2023) (Pre-release RC4)
|
// 4013 - V3.6 DEVELOPMENT 2303 (MAR 2023) (Pre-release RC4)
|
||||||
// 5000 - V3.6 RELEASE (August 2023) - latest snapshot 12/3/24
|
// 5000 - V3.6 RELEASE (August 2023)
|
||||||
// 5001 - V3.7 DEVELOPMENT
|
// 5001 - V3.7 DEVELOPMENT 2404 (APR 2024) - latest snapshot 13/4/24
|
||||||
|
|
||||||
#define VERSION3_BUILD 3010 // released
|
#define VERSION3_BUILD 3010 // released
|
||||||
#define VERSION3_SP1 3030 // released
|
#define VERSION3_SP1 3030 // released
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ FunctionEnd
|
|||||||
|
|
||||||
; HM NIS Edit Wizard helper defines
|
; HM NIS Edit Wizard helper defines
|
||||||
!define PRODUCT_NAME "Golden Cheetah"
|
!define PRODUCT_NAME "Golden Cheetah"
|
||||||
!define PRODUCT_VERSION "v3.6"
|
!define PRODUCT_VERSION "v3.7-DEV"
|
||||||
!define PRODUCT_BIT "64"
|
!define PRODUCT_BIT "64"
|
||||||
!define PRODUCT_STARTMENU "Golden Cheetah"
|
!define PRODUCT_STARTMENU "Golden Cheetah"
|
||||||
!define PRODUCT_WEB_SITE_FILENAME "GoldenCheetah WebSite"
|
!define PRODUCT_WEB_SITE_FILENAME "GoldenCheetah WebSite"
|
||||||
@@ -311,23 +311,12 @@ Section /o "Visual C++ Redistributable" Sec2
|
|||||||
|
|
||||||
SectionEnd
|
SectionEnd
|
||||||
|
|
||||||
;Section /o "R-Project (3.6.3)" Sec3
|
|
||||||
;
|
|
||||||
; SetOutPath "$INSTDIR"
|
|
||||||
; SetOverwrite ifnewer
|
|
||||||
; File "R-3.6.3-win.exe"
|
|
||||||
; ExecWait 'R-3.6.3-win.exe'
|
|
||||||
;
|
|
||||||
;SectionEnd
|
|
||||||
|
|
||||||
LangString DESC_Sec1 ${LANG_ENGLISH} "Golden Cheetah for Windows - 64Bit"
|
LangString DESC_Sec1 ${LANG_ENGLISH} "Golden Cheetah for Windows - 64Bit"
|
||||||
LangString DESC_Sec2 ${LANG_ENGLISH} "Microsoft Visual C++ 2015-2019 Redistributable (x64) is required to run Golden Cheetah for Windows"
|
LangString DESC_Sec2 ${LANG_ENGLISH} "Microsoft Visual C++ 2015-2019 Redistributable (x64) is required to run Golden Cheetah for Windows"
|
||||||
;LangString DESC_Sec3 ${LANG_ENGLISH} "R (3.6.x) for Windows is required to use R-based Charts in Golden Cheetah"
|
|
||||||
|
|
||||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||||
!insertmacro MUI_DESCRIPTION_TEXT ${Sec1} $(DESC_Sec1)
|
!insertmacro MUI_DESCRIPTION_TEXT ${Sec1} $(DESC_Sec1)
|
||||||
!insertmacro MUI_DESCRIPTION_TEXT ${Sec2} $(DESC_Sec2)
|
!insertmacro MUI_DESCRIPTION_TEXT ${Sec2} $(DESC_Sec2)
|
||||||
; !insertmacro MUI_DESCRIPTION_TEXT ${Sec3} $(DESC_Sec3)
|
|
||||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||||
|
|
||||||
|
|
||||||
@@ -81,7 +81,7 @@ then echo "AppImage not generated, check the errors"; exit 1
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Renaming AppImage file to branch and build number ready for deploy"
|
echo "Renaming AppImage file to branch and build number ready for deploy"
|
||||||
export FINAL_NAME=GoldenCheetah_v3.6-DEV_x64.AppImage
|
export FINAL_NAME=GoldenCheetah_v3.7-DEV_x64.AppImage
|
||||||
mv GoldenCheetah*.AppImage $FINAL_NAME
|
mv GoldenCheetah*.AppImage $FINAL_NAME
|
||||||
ls -l $FINAL_NAME
|
ls -l $FINAL_NAME
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ python3.7 -m pip install travis-wait-improved
|
|||||||
/Library/Frameworks/Python.framework/Versions/3.7/bin/travis-wait-improved --timeout 20m /usr/local/opt/qt5/bin/macdeployqt GoldenCheetah.app -verbose=2 -fs=hfs+ -dmg
|
/Library/Frameworks/Python.framework/Versions/3.7/bin/travis-wait-improved --timeout 20m /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"
|
echo "Renaming dmg file to branch and build number ready for deploy"
|
||||||
export FINAL_NAME=GoldenCheetah_v3.6-DEV_x64.dmg
|
export FINAL_NAME=GoldenCheetah_v3.7-DEV_x64.dmg
|
||||||
mv GoldenCheetah.dmg $FINAL_NAME
|
mv GoldenCheetah.dmg $FINAL_NAME
|
||||||
ls -l $FINAL_NAME
|
ls -l $FINAL_NAME
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user