aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing issues.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2021-05-02 16:24:59 +03:00
parent 9b268395f2
commit 0479b897c5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -85,7 +85,7 @@ before_install:
fi fi
brew install python3; brew install python3;
python3 --version; python3 --version;
pip install dropbox; pip3 install dropbox;
fi fi
before_script: before_script:
- | - |

14
appveyor.yml
View File

@ -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 "%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" "%PYTHON%\\python -m pip install dropbox" - if "%DEPLOY%" == "true" set PATH="%PYTHON%;%PYTHON%\\Scripts\\;%PATH%"
- if "%DEPLOY%" == "true" set PATH="%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% - 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
@ -252,8 +257,9 @@ after_test:
# scripts to run before deployment # scripts to run before deployment
before_deploy: 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 # to run your custom scripts instead of provider deployments
deploy_script: 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)