diff --git a/.travis.yml b/.travis.yml index f62b08c87..adf9d2fbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,8 @@ before_install: unset SSL_CERT_FILE; HOMEBREW_NO_AUTO_UPDATE=1 brew install https://gist.githubusercontent.com/dismine/c3ac01de38e12edcf22d9e05791adf82/raw/f553c39bbc5f3a2b231a767924e846bdd2a56d8d/qt.rb; brew link qt --force; - chmod -R 755 /usr/local/opt/qt/* + chmod -R 755 /usr/local/opt/qt/*; + HOMEBREW_NO_AUTO_UPDATE=1 brew install python3; fi python3 --version; pip3 install dropbox; @@ -140,9 +141,9 @@ after_success: ../scripts/macfixqtdylibrpath.py $TRAVIS_BUILD_DIR/build/src/app/valentina/bin/Valentina.app; if [[ "$LEGACY" = false ]]; then tar -C $TRAVIS_BUILD_DIR/build/src/app/valentina/bin --exclude "*.DS_Store" -cvzf valentina-osx-${TRAVIS_COMMIT}.tar.gz Valentina.app/; - python3 $TRAVIS_BUILD_DIR/scripts/deploy.py upload $ACCESS_TOKEN $TRAVIS_BUILD_DIR/build/src/app/valentina/bin/valentina-osx-${TRAVIS_COMMIT}.tar.gz "0.7.x/Mac OS X/valentina-osx-${TRAVIS_COMMIT}.tar.gz"; + python3 $TRAVIS_BUILD_DIR/scripts/deploy.py upload $ACCESS_TOKEN $TRAVIS_BUILD_DIR/build/valentina-osx-${TRAVIS_COMMIT}.tar.gz "0.7.x/Mac OS X/valentina-osx-${TRAVIS_COMMIT}.tar.gz"; else tar -C $TRAVIS_BUILD_DIR/build/src/app/valentina/bin --exclude "*.DS_Store" -cvzf valentina-osx-${TRAVIS_COMMIT}-legacy.tar.gz Valentina.app/; - python3 $TRAVIS_BUILD_DIR/scripts/deploy.py upload $ACCESS_TOKEN $TRAVIS_BUILD_DIR/build/src/app/valentina/bin/valentina-osx-${TRAVIS_COMMIT}-legacy.tar.gz "0.7.x/Mac OS X/valentina-osx-${TRAVIS_COMMIT}-legacy.tar.gz"; + python3 $TRAVIS_BUILD_DIR/scripts/deploy.py upload $ACCESS_TOKEN $TRAVIS_BUILD_DIR/build/valentina-osx-${TRAVIS_COMMIT}-legacy.tar.gz "0.7.x/Mac OS X/valentina-osx-${TRAVIS_COMMIT}-legacy.tar.gz"; fi fi diff --git a/appveyor.yml b/appveyor.yml index b5f329c25..0fe950b0a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -195,12 +195,12 @@ 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" 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)\"" + - 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" + - 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 @@ -257,9 +257,9 @@ after_test: # scripts to run before deployment 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%\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.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%\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)