Another try to make it work.

This commit is contained in:
Roman Telezhynskyi 2021-05-02 19:55:46 +03:00
parent ff6887dec4
commit d998a0e145

View File

@ -195,16 +195,17 @@ init:
- if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%QMAKE_GENERATOR%"=="NMake Makefiles JOM" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" if "%QMAKE_GENERATOR%"=="NMake Makefiles JOM" if "%PLATFORM%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
- if "%QMAKE_GENERATOR%" == "MinGW Makefiles" set PATH=%MINGW_PATH%;%PATH% - if "%QMAKE_GENERATOR%" == "MinGW Makefiles" set PATH=%MINGW_PATH%;%PATH%
- if "%QMAKE_GENERATOR%" == "NMake Makefiles JOM" set PATH=C:\Qt\Tools\QtCreator\bin;%PATH% - if "%QMAKE_GENERATOR%" == "NMake Makefiles JOM" set PATH=C:\Qt\Tools\QtCreator\bin;%PATH%
- if "%DEPLOY%" == "true" set PATH="%PYTHON%;%PYTHON%\Scripts;%PATH%" - if "%DEPLOY%" == "true" "SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%"
# Check that we have the expected version and architecture for Python
- if "%DEPLOY%" == "true" "%PYTHON%\python.exe --version"
- if "%DEPLOY%" == "true" "%PYTHON%\python.exe -c \"import struct; print(struct.calcsize('P') * 8)\""
# Install the build dependencies of the project.
- if "%DEPLOY%" == "true" "%PYTHON%\python.exe -m pip install dropbox"
# Set paths to libraries # Set paths to libraries
- set PATH=C:\projects\valentina\build\src\libs\vpropertyexplorer\bin;C:\projects\valentina\build\src\libs\qmuparser\bin;%PATH% - set PATH=C:\projects\valentina\build\src\libs\vpropertyexplorer\bin;C:\projects\valentina\build\src\libs\qmuparser\bin;%PATH%
# Path after # Path after
- path - path
# Check that we have the expected version and architecture for Python
- if "%DEPLOY%" == "true" "python --version"
- if "%DEPLOY%" == "true" "python -c \"import struct; print(struct.calcsize('P') * 8)\""
# Install the build dependencies of the project.
- if "%DEPLOY%" == "true" "python -m pip install --upgrade pip"
- if "%DEPLOY%" == "true" "python -m pip install dropbox"
# Trick qmake to not work through MSYS # Trick qmake to not work through MSYS
- del /F "C:\Program Files\Git\usr\bin\sh.exe" - del /F "C:\Program Files\Git\usr\bin\sh.exe"
- del /F "C:\Program Files\Git\bin\sh.exe" - del /F "C:\Program Files\Git\bin\sh.exe"
@ -257,9 +258,9 @@ after_test:
# scripts to run before deployment # scripts to run before deployment
before_deploy: before_deploy:
- if "%DEPLOY%" == "true" (%PYTHON%\python.exe ..\scripts\deploy.py pack .\package\valentina\ .\package\valentina-win-$(PLATFORM)-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT).zip) - if "%DEPLOY%" == "true" "python ..\scripts\deploy.py pack .\package\valentina\ .\package\valentina-win-$(PLATFORM)-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT).zip"
# to run your custom scripts instead of provider deployments # to run your custom scripts instead of provider deployments
deploy_script: deploy_script:
- if "%DEPLOY%" == "true" (%PYTHON%\python.exe ..\scripts\deploy.py upload $(ACCESS_TOKEN) .\package\valentina-win-$(PLATFORM)-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT).zip /0.7.x/Windows/valentina-win-$(PLATFORM)-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT).zip) - if "%DEPLOY%" == "true" "python ..\scripts\deploy.py upload $(ACCESS_TOKEN) .\package\valentina-win-$(PLATFORM)-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT).zip /0.7.x/Windows/valentina-win-$(PLATFORM)-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT).zip"