From 0479b897c5ed4de588c317c8de5e138acaf901f4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 2 May 2021 16:24:59 +0300 Subject: [PATCH] Fixing issues. --- .travis.yml | 2 +- appveyor.yml | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e005f8fcb..f4bdc7f67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ before_install: fi brew install python3; python3 --version; - pip install dropbox; + pip3 install dropbox; fi before_script: - | diff --git a/appveyor.yml b/appveyor.yml index 01e4340a4..69a1c97c7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -195,8 +195,13 @@ 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 "%QMAKE_GENERATOR%" == "MinGW Makefiles" set PATH=%MINGW_PATH%;%PATH% - if "%QMAKE_GENERATOR%" == "NMake Makefiles JOM" set PATH=C:\Qt\Tools\QtCreator\bin;%PATH% - - if "%DEPLOY%" == "true" "%PYTHON%\\python -m pip install dropbox" - - if "%DEPLOY%" == "true" set PATH="%PYTHON%\\Scripts\\;%PATH%" + - if "%DEPLOY%" == "true" set PATH="%PYTHON%;%PYTHON%\\Scripts\\;%PATH%" + # Check that we have the expected version and architecture for Python + - "python --version" + - "python -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 PATH=C:\projects\valentina\build\src\libs\vpropertyexplorer\bin;C:\projects\valentina\build\src\libs\qmuparser\bin;%PATH% # Path after - path @@ -252,8 +257,9 @@ after_test: # scripts to run before deployment before_deploy: - - if "%DEPLOY%" == "true" (%PYTHON%\\python ..\scripts\deploy.py pack ./package/valentina/ ./package/valentina-win-$(PLATFORM)-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT).zip) + - 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) # to run your custom scripts instead of provider deployments deploy_script: - - if "%DEPLOY%" == "true" (%PYTHON%\\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) + - 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) +