mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 15:24:03 +02:00
Compare commits
No commits in common. "2dff4162b7fc5d7a419fbb26a0399d741ee5bca4" and "cfc901b7ecc4b689c7d959ce02b194e1657f1a11" have entirely different histories.
2dff4162b7
...
cfc901b7ec
|
@ -184,7 +184,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
||||
- echo $PATH
|
||||
- pwd
|
||||
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=missing
|
||||
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/3.2.4
|
||||
- qbs setup-toolchains --detect
|
||||
- qbs config --list profiles
|
||||
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
|
||||
|
|
18
appveyor.yml
18
appveyor.yml
|
@ -380,7 +380,7 @@ for:
|
|||
- del /F "C:\Program Files\Git\usr\bin\sh.exe"
|
||||
- del /F "C:\Program Files\Git\bin\sh.exe"
|
||||
- dir "%QTDIR%\bin"
|
||||
- "%QTDIR%\\bin\\%QMAKE% -v"
|
||||
- "%QMAKE% -v"
|
||||
- qbs --version
|
||||
|
||||
before_build:
|
||||
|
@ -420,8 +420,8 @@ for:
|
|||
- qbs-config --list profiles
|
||||
|
||||
build_script:
|
||||
- conan install . -s os=Windows --build=missing -pr valentina
|
||||
- qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build 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%
|
||||
- conan install . -s os=Windows --build=xerces-c/3.2.4 -pr valentina
|
||||
- qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --command-echo-mode command-line 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%
|
||||
|
||||
test_script:
|
||||
- qbs -p autotest-runner -d %APPVEYOR_BUILD_FOLDER%\build profile:qt6 config:release
|
||||
|
@ -541,7 +541,6 @@ for:
|
|||
|
||||
environment:
|
||||
CONAN_USER_HOME: /Users/appveyor/.conan
|
||||
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
||||
|
||||
cache:
|
||||
- /Users/appveyor/.conan/data -> conan-cache
|
||||
|
@ -551,9 +550,12 @@ for:
|
|||
- sudo xcode-select -p
|
||||
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
||||
- sudo xcode-select -p
|
||||
- ls ${HOME}/Qt
|
||||
- brew update > /dev/null
|
||||
- brew deps -n qbs
|
||||
- brew install --ignore-dependencies libpng freetype pcre2 gettext glib jpeg-turbo giflib lz4 xz zstd libtiff webp qt@5
|
||||
- brew install --ignore-dependencies qbs
|
||||
- export QTDIR="${HOME}/${QT}"
|
||||
- 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:$PATH"
|
||||
- echo $PATH
|
||||
- python3 --version
|
||||
- |
|
||||
|
@ -574,14 +576,14 @@ for:
|
|||
- pwd
|
||||
- |
|
||||
if [[ "$ENABLE_CONAN" == "true" ]]; then
|
||||
conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=missing
|
||||
conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/3.2.4
|
||||
fi
|
||||
- qbs setup-toolchains --detect
|
||||
- qbs config --list profiles
|
||||
- qbs setup-qt ${QTDIR}/bin/qmake qt6
|
||||
- qbs config defaultProfile qt6
|
||||
- qbs config profiles.qt6.baseProfile clang
|
||||
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false
|
||||
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false
|
||||
|
||||
deploy_script:
|
||||
- CIRRUS_WORKING_DIR=${APPVEYOR_BUILD_FOLDER} CIRRUS_CHANGE_IN_REPO=${APPVEYOR_REPO_COMMIT} CIRRUS_BRANCH=${APPVEYOR_REPO_BRANCH} ${APPVEYOR_BUILD_FOLDER}/scripts/cirrus-deploy.sh
|
||||
|
|
Loading…
Reference in a new issue