mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
No commits in common. "c26d913ab6dc37ed791b9c01b9162856f03def64" and "f6e44564ff90e79267b2312d3b1c729f9efec328" have entirely different histories.
c26d913ab6
...
f6e44564ff
12
appveyor.yml
12
appveyor.yml
|
@ -351,19 +351,15 @@ for:
|
||||||
- (python -m pip install --upgrade pip)
|
- (python -m pip install --upgrade pip)
|
||||||
- if "%DEPLOY%" == "true" (python -m pip install dropbox)
|
- if "%DEPLOY%" == "true" (python -m pip install dropbox)
|
||||||
- python -m pip install conan==1.61.0
|
- python -m pip install conan==1.61.0
|
||||||
|
# Trick qmake to not work through MSYS
|
||||||
|
- del /F "C:\Program Files\Git\usr\bin\sh.exe"
|
||||||
|
- del /F "C:\Program Files\Git\bin\sh.exe"
|
||||||
- dir "C:\"
|
- dir "C:\"
|
||||||
- dir "C:\Qt"
|
- dir "C:\Qt"
|
||||||
- dir "C:\Qt\Tools"
|
- dir "C:\Qt\Tools"
|
||||||
- dir %QTDIR%
|
- dir %QTDIR%
|
||||||
- dir "%QTDIR%\bin"
|
- dir "%QTDIR%\bin"
|
||||||
- qbs --version
|
- qbs --version
|
||||||
# Patch Qbs. Remove after Qbs 2.2.1+.
|
|
||||||
- ps: |
|
|
||||||
Invoke-WebRequest -Uri "https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch" -OutFile "$env:USERPROFILE\qbs-pkg-config-probe.patch"
|
|
||||||
$qbsInstallationDir = "C:\ProgramData\chocolatey\lib\qbs\tools"
|
|
||||||
cmd.exe /c "patch -p1 -N -d $qbsInstallationDir -i $env:USERPROFILE\qbs-pkg-config-probe.patch"
|
|
||||||
Remove-Item -Path "$qbsInstallationDir\share\qbs\imports\qbs\Probes\qbs-pkg-config-probe.js.rej" -ErrorAction SilentlyContinue
|
|
||||||
Remove-Item -Path "$env:USERPROFILE\qbs-pkg-config-probe.patch" -ErrorAction SilentlyContinue
|
|
||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
- cd %APPVEYOR_BUILD_FOLDER%
|
- cd %APPVEYOR_BUILD_FOLDER%
|
||||||
|
@ -413,7 +409,7 @@ for:
|
||||||
- if "%RUN_TESTS%" == "true" (qbs -p autotest-runner -d %APPVEYOR_BUILD_FOLDER%\build profile:qt6 config:release)
|
- if "%RUN_TESTS%" == "true" (qbs -p autotest-runner -d %APPVEYOR_BUILD_FOLDER%\build profile:qt6 config:release)
|
||||||
|
|
||||||
deploy_script:
|
deploy_script:
|
||||||
- if "%DEPLOY%" == "true" (qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build -p ValentinaSetup --jobs %NUMBER_OF_PROCESSORS% config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH% modules.windeployqt.windeployqtProgramBinPath:%WINDEPLOYQT_BIN_PATH% modules.windeployqt.compilerRuntime:%WINDEPLOYQT_COMPILER_RUNTIME% modules.windeployqt.noCompilerRuntime:%WINDEPLOYQT_NO_COMPILER_RUNTIME%)
|
- if "%DEPLOY%" == "true" (qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build -p 'ValentinaSetup' --jobs %NUMBER_OF_PROCESSORS% config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH% modules.windeployqt.windeployqtProgramBinPath:%WINDEPLOYQT_BIN_PATH% modules.windeployqt.compilerRuntime:%WINDEPLOYQT_COMPILER_RUNTIME% modules.windeployqt.noCompilerRuntime:%WINDEPLOYQT_NO_COMPILER_RUNTIME%)
|
||||||
- ps: scripts/appveyor-deploy.ps1
|
- ps: scripts/appveyor-deploy.ps1
|
||||||
|
|
||||||
on_finish:
|
on_finish:
|
||||||
|
|
Loading…
Reference in a new issue