mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
No commits in common. "e4cc5b52bc8a83abc3d59f0a2b2e941209ec00a8" and "aa22dcf8705755e9f76b8ba957cb28b4244eab2b" have entirely different histories.
e4cc5b52bc
...
aa22dcf870
19
.cirrus.yml
19
.cirrus.yml
|
@ -229,17 +229,17 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
# This won't display anything secret.
|
# This won't display anything secret.
|
||||||
- security find-identity -v -p codesigning
|
- security find-identity -v -p codesigning
|
||||||
- brew update > /dev/null
|
- brew update > /dev/null
|
||||||
- brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler xerces-c
|
- brew install qt6 coreutils ccache qbs cmake ninja git openssl@1.1 pkg-config poppler
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
- chmod -R 755 /opt/homebrew/opt/qt6/*
|
- chmod -R 755 /opt/homebrew/opt/qt6/*
|
||||||
- chmod -R 755 /opt/homebrew/opt/openssl@1.1/*
|
- chmod -R 755 /opt/homebrew/opt/openssl@1.1/*
|
||||||
- chmod -R 755 /opt/homebrew/opt/poppler/*
|
- chmod -R 755 /opt/homebrew/opt/poppler/*
|
||||||
- chmod -R 755 /opt/homebrew/opt/xerces-c/*
|
|
||||||
- python3 --version
|
- python3 --version
|
||||||
- pip3 install --user --upgrade pip dropbox
|
- pip3 install --user --upgrade pip dropbox conan==1.61.0
|
||||||
- ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"
|
- ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"
|
||||||
|
- conan --version
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- which qmake
|
- which qmake
|
||||||
- qbs --version
|
- qbs --version
|
||||||
|
@ -260,13 +260,22 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
- unzip ${HOME}/macdeployqt-main.zip -d ${HOME}
|
||||||
- cmake ${HOME}/macdeployqt-main -GNinja -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
|
- cmake ${HOME}/macdeployqt-main -GNinja -S ${HOME}/macdeployqt-main -B ${HOME}/macdeployqt-build-dir -DCMAKE_INSTALL_PREFIX=${HOME}/macdeployqt-install-dir -DCMAKE_BUILD_TYPE=Release
|
||||||
- cmake --build ${HOME}/macdeployqt-build-dir --target install
|
- cmake --build ${HOME}/macdeployqt-build-dir --target install
|
||||||
|
- conan profile new valentina
|
||||||
|
- conan profile update settings.build_type=Release valentina
|
||||||
|
- conan profile update settings.os=Macos valentina
|
||||||
|
- conan profile update settings.os.version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||||
|
- conan profile update settings.arch=${ARCH} valentina
|
||||||
|
- conan profile update settings.compiler=apple-clang valentina
|
||||||
|
- conan profile update settings.compiler.libcxx=libc++ valentina
|
||||||
|
- conan profile update settings.compiler.version=14 valentina
|
||||||
|
- conan install . --build=missing -pr valentina
|
||||||
- qbs setup-toolchains --detect
|
- qbs setup-toolchains --detect
|
||||||
- qbs config --list profiles
|
- qbs config --list profiles
|
||||||
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
|
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
|
||||||
- qbs-config defaultProfile qt6
|
- qbs-config defaultProfile qt6
|
||||||
- qbs config profiles.qt6.baseProfile clang
|
- qbs config profiles.qt6.baseProfile clang
|
||||||
- qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
|
- qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
|
||||||
- qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
|
- qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
|
||||||
# Store the notarization credentials so that we can prevent a UI password dialog
|
# Store the notarization credentials so that we can prevent a UI password dialog
|
||||||
# from blocking the CI
|
# from blocking the CI
|
||||||
- echo "Create keychain profile"
|
- echo "Create keychain profile"
|
||||||
|
|
32
appveyor.yml
32
appveyor.yml
|
@ -45,7 +45,7 @@ environment:
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
||||||
COMPILER: clang
|
COMPILER: clang
|
||||||
QT: Qt/6.4/macos
|
QT: Qt/6.4/macos
|
||||||
QT_VERSION: Qt6
|
QT_VERSION: Qt6_4
|
||||||
BUILD_SYSTEM: "qbs"
|
BUILD_SYSTEM: "qbs"
|
||||||
ARCH: x64
|
ARCH: x64
|
||||||
XCODE_VERSION: 13.4.1
|
XCODE_VERSION: 13.4.1
|
||||||
|
@ -58,7 +58,7 @@ environment:
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
||||||
COMPILER: clang
|
COMPILER: clang
|
||||||
QT: Qt/6.4/macos
|
QT: Qt/6.4/macos
|
||||||
QT_VERSION: Qt6
|
QT_VERSION: Qt6_4
|
||||||
BUILD_SYSTEM: "qbs"
|
BUILD_SYSTEM: "qbs"
|
||||||
ARCH: x64
|
ARCH: x64
|
||||||
XCODE_VERSION: 13.4.1
|
XCODE_VERSION: 13.4.1
|
||||||
|
@ -583,7 +583,7 @@ for:
|
||||||
- job_name: MacOS_12_Qt_6_4 (singlebundle)
|
- job_name: MacOS_12_Qt_6_4 (singlebundle)
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
CONAN_USER_HOME: /Users/appveyor
|
CONAN_USER_HOME: /Users/appveyor/.conan
|
||||||
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
||||||
# Should contain the base64 of the certificate
|
# Should contain the base64 of the certificate
|
||||||
MACOS_CERTIFICATE:
|
MACOS_CERTIFICATE:
|
||||||
|
@ -693,7 +693,7 @@ for:
|
||||||
python3 ./scripts/treestate.py scan /usr/local usrlocal.json
|
python3 ./scripts/treestate.py scan /usr/local usrlocal.json
|
||||||
|
|
||||||
brew update
|
brew update
|
||||||
brew install coreutils ccache git openssl@1.1 pkg-config qbs qt6 cmake ninja poppler xerces-c
|
brew install coreutils ccache git openssl@1.1 pkg-config qbs cmake ninja poppler
|
||||||
|
|
||||||
# The build environment is now ready for use. We can complete
|
# The build environment is now ready for use. We can complete
|
||||||
# the rest of the process of creating the Homebrew archive
|
# the rest of the process of creating the Homebrew archive
|
||||||
|
@ -716,10 +716,11 @@ for:
|
||||||
|
|
||||||
fi
|
fi
|
||||||
- sudo python3 -m pip install --upgrade pip
|
- sudo python3 -m pip install --upgrade pip
|
||||||
- pip3 install --user --upgrade pip dropbox
|
- pip3 install --user --upgrade pip dropbox conan==1.61.0
|
||||||
- export PATH="$PATH:`python3 -m site --user-base`/bin"
|
- export PATH="$PATH:`python3 -m site --user-base`/bin"
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
- python3 --version
|
- python3 --version
|
||||||
|
- conan --version
|
||||||
- clang --version
|
- clang --version
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- which qmake
|
- which qmake
|
||||||
|
@ -737,13 +738,22 @@ for:
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- pwd
|
- pwd
|
||||||
|
- conan profile new valentina
|
||||||
|
- conan profile update settings.build_type=Release valentina
|
||||||
|
- conan profile update settings.os=Macos valentina
|
||||||
|
- conan profile update settings.os.version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||||
|
- conan profile update settings.arch=${ARCH} valentina
|
||||||
|
- conan profile update settings.compiler=apple-clang valentina
|
||||||
|
- conan profile update settings.compiler.libcxx=libc++ valentina
|
||||||
|
- conan profile update settings.compiler.version=14 valentina
|
||||||
|
- conan install . --build=missing -pr valentina
|
||||||
- qbs setup-toolchains --detect
|
- qbs setup-toolchains --detect
|
||||||
- qbs config --list profiles
|
- qbs config --list profiles
|
||||||
- qbs setup-qt $(brew --prefix qt6)/bin/qmake qt6
|
- qbs setup-qt ${QTDIR}/bin/qmake qt6
|
||||||
- qbs config defaultProfile qt6
|
- qbs config defaultProfile qt6
|
||||||
- qbs config profiles.qt6.baseProfile clang
|
- qbs config profiles.qt6.baseProfile clang
|
||||||
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
|
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) 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 project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
|
||||||
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
|
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) 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 project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir
|
||||||
# Store the notarization credentials so that we can prevent a UI password dialog
|
# Store the notarization credentials so that we can prevent a UI password dialog
|
||||||
# from blocking the CI
|
# from blocking the CI
|
||||||
- echo "Create keychain profile"
|
- echo "Create keychain profile"
|
||||||
|
@ -769,7 +779,7 @@ for:
|
||||||
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
|
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
CONAN_USER_HOME: /Users/appveyor
|
CONAN_USER_HOME: /Users/appveyor/.conan
|
||||||
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
||||||
# Should contain the base64 of the certificate
|
# Should contain the base64 of the certificate
|
||||||
MACOS_CERTIFICATE:
|
MACOS_CERTIFICATE:
|
||||||
|
@ -861,7 +871,7 @@ for:
|
||||||
- conan profile update settings.build_type=Release valentina
|
- conan profile update settings.build_type=Release valentina
|
||||||
- conan profile update settings.os=Macos valentina
|
- conan profile update settings.os=Macos valentina
|
||||||
- conan profile update settings.os.version=${MACOS_DEPLOYMENT_TARGET} valentina
|
- conan profile update settings.os.version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||||
- conan profile update settings.arch=x86_64 valentina
|
- conan profile update settings.arch=${ARCH} valentina
|
||||||
- conan profile update settings.compiler=apple-clang valentina
|
- conan profile update settings.compiler=apple-clang valentina
|
||||||
- conan profile update settings.compiler.libcxx=libc++ valentina
|
- conan profile update settings.compiler.libcxx=libc++ valentina
|
||||||
- conan profile update settings.compiler.version=14 valentina
|
- conan profile update settings.compiler.version=14 valentina
|
||||||
|
@ -872,7 +882,7 @@ for:
|
||||||
- qbs config defaultProfile qt6
|
- qbs config defaultProfile qt6
|
||||||
- qbs config profiles.qt6.baseProfile clang
|
- qbs config profiles.qt6.baseProfile clang
|
||||||
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) 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 project.conanProfiles:valentina "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME"
|
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) 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 project.conanProfiles:valentina "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME"
|
||||||
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) 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 project.conanProfiles:valentina "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME"
|
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build -p 'Valentina DMG' --force-probe-execution --jobs $(nproc) 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 project.conanProfiles:valentina moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME"
|
||||||
# notarytool supported since XCode 13. First we need to backport it.
|
# notarytool supported since XCode 13. First we need to backport it.
|
||||||
- curl https://bitbucket.org/valentinaproject/valentinaproject.bitbucket.io/downloads/notarytool.tar.xz --output $HOME/notarytool.tar.xz --silent
|
- curl https://bitbucket.org/valentinaproject/valentinaproject.bitbucket.io/downloads/notarytool.tar.xz --output $HOME/notarytool.tar.xz --silent
|
||||||
- tar -xf $HOME/notarytool.tar.xz
|
- tar -xf $HOME/notarytool.tar.xz
|
||||||
|
|
Loading…
Reference in a new issue