@@ -33,6 +33,7 @@ branches:
3333
3434environment :
3535 global :
36+ PYTHON_VERSION_MINOR : 7 # Default to Python 3.7
3637 MSYS_DIR : C:\msys64
3738 APPVEYOR_SAVE_CACHE_ON_ERROR : true
3839 CCACHE_DIR : C:\ccache.cache
@@ -45,30 +46,25 @@ environment:
4546 matrix :
4647 - QT : 5.12
4748 ARCH : 32
48- PYTHON_PATH : C:\Python37
4949 CONFIGURATION : release
5050 QTIFW : C:\Qt\Tools\QtInstallerFramework\3.1
51- APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
5251
5352 - QT : 5.12
5453 ARCH : 64
55- PYTHON_PATH : C:\Python37-x64
5654 CONFIGURATION : release
5755 QTIFW : C:\Qt\Tools\QtInstallerFramework\3.1
58- APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
5956
6057 - QT : 5.12
6158 ARCH : 32
62- PYTHON_PATH : C:\Python38
59+ PYTHON_VERSION_MINOR : 8
6360 CONFIGURATION : release
6461 QTIFW : C:\Qt\Tools\QtInstallerFramework\3.1
65- APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
6662
6763
6864# Qt5.14 build takes too long (2x times) and reaches timeout
6965# - QT: 5.14
7066# ARCH: 32
71- # PYTHON_PATH: C:\Python38
67+ # PYTHON_VERSION_MINOR: 8
7268# CONFIGURATION: release
7369# QTIFW: C:\Qt\Tools\QtInstallerFramework\3.2
7470# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
9591 - if "x%appveyor_pull_request_number%" NEQ "x" set APPVEYOR_CACHE_SKIP_SAVE=true
9692 - if "x%appveyor_repo_branch%" NEQ "xmaster" set APPVEYOR_CACHE_SKIP_SAVE=true
9793 - if "%ARCH%" == "32" (set PLATFORM=i686) else (set PLATFORM=x86_64)
94+ - set PYTHON_PATH=C:\Python3%PYTHON_VERSION_MINOR%
95+ - if "%ARCH%" == "64" (set PYTHON_PATH=%PYTHON_PATH%-x64)
9896 - set NEED_AUTOZIP=false
9997 - set NEED_BINZIP=false
10098 - set NEED_INSTALLER=false
@@ -108,6 +106,8 @@ init:
108106 - if "x%appveyor_pull_request_number%" EQU "x" (set NEED_AUTOZIP=true)
109107# this is a tagged commit build
110108 - if "%APPVEYOR_REPO_TAG%" EQU "true" ( set "NEED_INSTALLER=true" && set NEED_AUTOZIP=true )
109+ # disable artifacts for Python38
110+ - if "%PYTHON_VERSION_MINOR%" NEQ "7" ( set "NEED_INSTALLER=false" && set NEED_AUTOZIP=false )
111111 - ' echo "Deploy installer executable: %NEED_INSTALLER%"'
112112 - ' echo "Deploy \\bin zip archive: %NEED_BINZIP%"'
113113 - ' echo "Deploy full zipped installer: %NEED_AUTOZIP%"'
@@ -191,7 +191,7 @@ after_test:
191191 - build-trik-studio.sh %QTDIR%\bin %QTIFW%\bin %BUILD_DIR%
192192 - set INSTALLER_NAME=trik-studio
193193 - if %APPVEYOR_REPO_TAG%==true (set INSTALLER_NAME=%INSTALLER_NAME%_%APPVEYOR_REPO_TAG_NAME%) else (set INSTALLER_NAME=%INSTALLER_NAME%-%APPVEYOR_REPO_BRANCH_SAFE%)
194- - if "%QT %" NEQ "5.12 " ( set INSTALLER_NAME=%INSTALLER_NAME%-Qt%QT% )
194+ - if "%PYTHON_VERSION_MINOR %" NEQ "7 " (set INSTALLER_NAME=%INSTALLER_NAME%-Python3%PYTHON_VERSION_MINOR% )
195195 - set INSTALLER_NAME=%INSTALLER_NAME%-%PLATFORM%
196196 - set AUTOINSTALLER_ZIP_NAME=%INSTALLER_NAME%-auto.zip
197197 - set INSTALLER_NAME=%INSTALLER_NAME%-installer.exe
0 commit comments