mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 15:24:03 +02:00
Compare commits
No commits in common. "e55df88c22db8c224a46f2fd737406300a7d8bb8" and "2dff4162b7fc5d7a419fbb26a0399d741ee5bca4" have entirely different histories.
e55df88c22
...
2dff4162b7
20
appveyor.yml
20
appveyor.yml
|
@ -100,6 +100,7 @@ environment:
|
||||||
PLATFORM: "macOS_11+"
|
PLATFORM: "macOS_11+"
|
||||||
MACOS_DEPLOYMENT_TARGET: 11.0
|
MACOS_DEPLOYMENT_TARGET: 11.0
|
||||||
MULTI_BUNDLE: true
|
MULTI_BUNDLE: true
|
||||||
|
ENABLE_CONAN: true
|
||||||
DEPLOY: true
|
DEPLOY: true
|
||||||
|
|
||||||
- job_name: MacOS_12_Qt_6_4 (singlebundle)
|
- job_name: MacOS_12_Qt_6_4 (singlebundle)
|
||||||
|
@ -113,6 +114,7 @@ environment:
|
||||||
PLATFORM: "macOS_11+"
|
PLATFORM: "macOS_11+"
|
||||||
MACOS_DEPLOYMENT_TARGET: 11.0
|
MACOS_DEPLOYMENT_TARGET: 11.0
|
||||||
MULTI_BUNDLE: false
|
MULTI_BUNDLE: false
|
||||||
|
ENABLE_CONAN: true
|
||||||
DEPLOY: true
|
DEPLOY: true
|
||||||
|
|
||||||
- job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
|
- job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
|
||||||
|
@ -126,6 +128,7 @@ environment:
|
||||||
PLATFORM: "macOS10.13+"
|
PLATFORM: "macOS10.13+"
|
||||||
MACOS_DEPLOYMENT_TARGET: 10.13
|
MACOS_DEPLOYMENT_TARGET: 10.13
|
||||||
MULTI_BUNDLE: true
|
MULTI_BUNDLE: true
|
||||||
|
ENABLE_CONAN: false
|
||||||
DEPLOY: true
|
DEPLOY: true
|
||||||
|
|
||||||
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
|
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
|
||||||
|
@ -139,6 +142,7 @@ environment:
|
||||||
PLATFORM: "macOS10.13+"
|
PLATFORM: "macOS10.13+"
|
||||||
MACOS_DEPLOYMENT_TARGET: 10.13
|
MACOS_DEPLOYMENT_TARGET: 10.13
|
||||||
MULTI_BUNDLE: false
|
MULTI_BUNDLE: false
|
||||||
|
ENABLE_CONAN: false
|
||||||
DEPLOY: true
|
DEPLOY: true
|
||||||
|
|
||||||
- job_name: Windows_Qt_5_15_(make_GCC_x86)
|
- job_name: Windows_Qt_5_15_(make_GCC_x86)
|
||||||
|
@ -376,8 +380,7 @@ for:
|
||||||
- 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"
|
||||||
- dir "%QTDIR%\bin"
|
- dir "%QTDIR%\bin"
|
||||||
- |
|
- "%QTDIR%\\bin\\%QMAKE% -v"
|
||||||
"%QTDIR%\\bin\\%QMAKE%" -v
|
|
||||||
- qbs --version
|
- qbs --version
|
||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
|
@ -553,8 +556,12 @@ for:
|
||||||
- export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:${HOME}/Qt/Qt Creator.app/Contents/MacOS:$PATH"
|
- export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:${HOME}/Qt/Qt Creator.app/Contents/MacOS:$PATH"
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
- python3 --version
|
- python3 --version
|
||||||
- pip3 install --user --upgrade pip dropbox conan==1.59
|
- |
|
||||||
- conan --version
|
if [[ "$ENABLE_CONAN" == "true" ]]; then
|
||||||
|
pip3 install --user --upgrade conan==1.59;
|
||||||
|
conan --version
|
||||||
|
fi
|
||||||
|
- pip3 install --user --upgrade pip dropbox
|
||||||
- clang --version
|
- clang --version
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- which qmake
|
- which qmake
|
||||||
|
@ -565,7 +572,10 @@ for:
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- pwd
|
- pwd
|
||||||
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=missing
|
- |
|
||||||
|
if [[ "$ENABLE_CONAN" == "true" ]]; then
|
||||||
|
conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=missing
|
||||||
|
fi
|
||||||
- qbs setup-toolchains --detect
|
- qbs setup-toolchains --detect
|
||||||
- qbs config --list profiles
|
- qbs config --list profiles
|
||||||
- qbs setup-qt ${QTDIR}/bin/qmake qt6
|
- qbs setup-qt ${QTDIR}/bin/qmake qt6
|
||||||
|
|
Loading…
Reference in a new issue