Fix build script.
This commit is contained in:
parent
3320a27268
commit
cc2ed983dc
|
@ -320,6 +320,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
- clang --version
|
- clang --version
|
||||||
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
|
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
|
||||||
- sudo xcode-select -p
|
- sudo xcode-select -p
|
||||||
|
- xcrun --show-sdk-path -sdk macosx
|
||||||
# Decode the environment variable into a regular .p12 file
|
# Decode the environment variable into a regular .p12 file
|
||||||
- echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
|
- echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
|
||||||
# We need to create a new keychain, otherwise using the certificate will prompt
|
# We need to create a new keychain, otherwise using the certificate will prompt
|
||||||
|
@ -386,9 +387,9 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
- conan profile update settings.os=Macos valentina
|
- conan profile update settings.os=Macos valentina
|
||||||
- conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
|
- conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
|
||||||
- conan profile update settings.arch=armv8 valentina
|
- conan profile update settings.arch=armv8 valentina
|
||||||
- conan profile update settings.compiler=clang valentina
|
- conan profile update settings.compiler=apple-clang valentina
|
||||||
- conan profile update settings.compiler.cppstd=17 valentina
|
- conan profile update settings.compiler.cppstd=17 valentina
|
||||||
- conan profile update settings.compiler.libcxx=libstdc++11 valentina
|
- conan profile update settings.compiler.libcxx=libc++ valentina
|
||||||
- conan profile update settings.compiler.version=15 valentina
|
- conan profile update settings.compiler.version=15 valentina
|
||||||
- qbs setup-toolchains --detect
|
- qbs setup-toolchains --detect
|
||||||
- qbs config --list profiles
|
- qbs config --list profiles
|
||||||
|
|
|
@ -414,7 +414,7 @@ for:
|
||||||
deploy_script:
|
deploy_script:
|
||||||
- ps: |
|
- ps: |
|
||||||
if ($env:WITH_CRASH_REPORTING -eq "True") {
|
if ($env:WITH_CRASH_REPORTING -eq "True") {
|
||||||
$qmakeOutput = %QTDIR%\bin\%QMAKE% -query QT_VERSION
|
$qmakeOutput = $env:QTDIR\bin\$env:QMAKE -query QT_VERSION
|
||||||
$majorMinorVersion = $qmakeOutput -replace '\D+(\d+)\.(\d+).*', '$1_$2'
|
$majorMinorVersion = $qmakeOutput -replace '\D+(\d+)\.(\d+).*', '$1_$2'
|
||||||
$env:CRASH_QT_VERSION = $majorMinorVersion
|
$env:CRASH_QT_VERSION = $majorMinorVersion
|
||||||
|
|
||||||
|
@ -561,6 +561,7 @@ for:
|
||||||
- sudo xcode-select -p
|
- sudo xcode-select -p
|
||||||
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
||||||
- sudo xcode-select -p
|
- sudo xcode-select -p
|
||||||
|
- xcrun --show-sdk-path -sdk macosx
|
||||||
# Decode the environment variable into a regular .p12 file
|
# Decode the environment variable into a regular .p12 file
|
||||||
- echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
|
- echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
|
||||||
# We need to create a new keychain, otherwise using the certificate will prompt
|
# We need to create a new keychain, otherwise using the certificate will prompt
|
||||||
|
@ -761,6 +762,7 @@ for:
|
||||||
- sudo xcode-select -p
|
- sudo xcode-select -p
|
||||||
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
||||||
- sudo xcode-select -p
|
- sudo xcode-select -p
|
||||||
|
- xcrun --show-sdk-path -sdk macosx
|
||||||
# Decode the environment variable into a regular .p12 file
|
# Decode the environment variable into a regular .p12 file
|
||||||
- echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
|
- echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
|
||||||
# We need to create a new keychain, otherwise using the certificate will prompt
|
# We need to create a new keychain, otherwise using the certificate will prompt
|
||||||
|
|
Loading…
Reference in New Issue
Block a user