mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
No commits in common. "1227e6c4e39fd3c6ab3e163b74c6aca3e1360c4f" and "b462286a23e11c2a2b8bc7a1ffdf1aa9f9a3f130" have entirely different histories.
1227e6c4e3
...
b462286a23
11
.cirrus.yml
11
.cirrus.yml
|
|
@ -200,11 +200,11 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
# with a UI dialog asking for the certificate password, which we can't
|
||||
# use in a headless CI environment
|
||||
# Create the keychain with a password ($MACOS_CI_KEYCHAIN_PWD)
|
||||
- security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
|
||||
# Make the custom keychain default, so xcodebuild will use it for signing
|
||||
- security default-keychain -s $HOME/Library/Keychains/build.keychain
|
||||
- security default-keychain -s build.keychain
|
||||
# Unlock the keychain
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
|
||||
# Check if System.keychain is not cluttered
|
||||
# good: 60K
|
||||
# bad: 25MB
|
||||
|
|
@ -217,13 +217,13 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
- curl https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer --output $HOME/DeveloperIDG2CA.cer --silent
|
||||
- sudo security import $HOME/DeveloperIDG2CA.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
|
||||
# 3) Developer ID
|
||||
- security import certificate.p12 -k $HOME/Library/Keychains/build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
|
||||
- security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
|
||||
# Delete the files, we no longer need them
|
||||
- rm $HOME/AppleWWDRCAG3.cer
|
||||
- rm $HOME/DeveloperIDG2CA.cer
|
||||
- rm certificate.p12
|
||||
# Set the partition list (sort of like an access control list)
|
||||
- security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
|
||||
# Echo the identity, just so that we know it worked.
|
||||
# This won't display anything secret.
|
||||
- security find-identity -v -p codesigning
|
||||
|
|
@ -256,7 +256,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
- sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
|
||||
- whereis python
|
||||
- pwd
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- conan profile new valentina
|
||||
- conan profile update settings.build_type=Release valentina
|
||||
- conan profile update settings.os=Macos valentina
|
||||
|
|
|
|||
24
appveyor.yml
24
appveyor.yml
|
|
@ -623,11 +623,11 @@ for:
|
|||
# with a UI dialog asking for the certificate password, which we can't
|
||||
# use in a headless CI environment
|
||||
# Create the keychain with a password ($MACOS_CI_KEYCHAIN_PWD)
|
||||
- security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
|
||||
# Make the custom keychain default, so xcodebuild will use it for signing
|
||||
- security default-keychain -s $HOME/Library/Keychains/build.keychain
|
||||
- security default-keychain -s build.keychain
|
||||
# Unlock the keychain
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
|
||||
# Check if System.keychain is not cluttered
|
||||
# good: 60K
|
||||
# bad: 25MB
|
||||
|
|
@ -640,13 +640,13 @@ for:
|
|||
- curl https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer --output $HOME/DeveloperIDG2CA.cer --silent
|
||||
- sudo security import $HOME/DeveloperIDG2CA.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
|
||||
# 3) Developer ID
|
||||
- security import certificate.p12 -k $HOME/Library/Keychains/build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
|
||||
- security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
|
||||
# Delete the files, we no longer need them
|
||||
- rm $HOME/AppleWWDRCAG3.cer
|
||||
- rm $HOME/DeveloperIDG2CA.cer
|
||||
- rm certificate.p12
|
||||
# Set the partition list (sort of like an access control list)
|
||||
- security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
|
||||
# Echo the identity, just so that we know it worked.
|
||||
# This won't display anything secret.
|
||||
- security find-identity -v -p codesigning
|
||||
|
|
@ -659,7 +659,6 @@ for:
|
|||
- python3 --version
|
||||
- whereis python3
|
||||
- sudo ln -s -f /usr/bin/python3 /usr/local/bin/python
|
||||
- sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
|
||||
- whereis python
|
||||
- |-
|
||||
|
||||
|
|
@ -728,7 +727,6 @@ for:
|
|||
|
||||
build_script:
|
||||
- pwd
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=missing
|
||||
- qbs setup-toolchains --detect
|
||||
- qbs config --list profiles
|
||||
|
|
@ -800,11 +798,11 @@ for:
|
|||
# with a UI dialog asking for the certificate password, which we can't
|
||||
# use in a headless CI environment
|
||||
# Create the keychain with a password ($MACOS_CI_KEYCHAIN_PWD)
|
||||
- security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
|
||||
# Make the custom keychain default, so xcodebuild will use it for signing
|
||||
- security default-keychain -s $HOME/Library/Keychains/build.keychain
|
||||
- security default-keychain -s build.keychain
|
||||
# Unlock the keychain
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
|
||||
# Check if System.keychain is not cluttered
|
||||
# good: 60K
|
||||
# bad: 25MB
|
||||
|
|
@ -817,13 +815,13 @@ for:
|
|||
- curl https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer --output $HOME/DeveloperIDG2CA.cer --silent
|
||||
- sudo security import $HOME/DeveloperIDG2CA.cer -k /Library/Keychains/System.keychain -T /usr/bin/codesign
|
||||
# 3) Developer ID
|
||||
- security import certificate.p12 -k $HOME/Library/Keychains/build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
|
||||
- security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
|
||||
# Delete the files, we no longer need them
|
||||
- rm $HOME/AppleWWDRCAG3.cer
|
||||
- rm $HOME/DeveloperIDG2CA.cer
|
||||
- rm certificate.p12
|
||||
# Set the partition list (sort of like an access control list)
|
||||
- security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- security set-key-partition-list -S "apple-tool:,apple:,codesign:" -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
|
||||
# Echo the identity, just so that we know it worked.
|
||||
# This won't display anything secret.
|
||||
- security find-identity -v -p codesigning
|
||||
|
|
@ -836,7 +834,6 @@ for:
|
|||
- python3 --version
|
||||
- whereis python3
|
||||
- sudo ln -s -f /usr/bin/python3 /usr/local/bin/python
|
||||
- sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
|
||||
- whereis python
|
||||
- sudo python3 -m pip install --upgrade pip
|
||||
- pip3 install --user --upgrade pip dropbox conan==1.60
|
||||
|
|
@ -849,7 +846,6 @@ for:
|
|||
|
||||
build_script:
|
||||
- pwd
|
||||
- security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" $HOME/Library/Keychains/build.keychain
|
||||
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=missing
|
||||
- qbs setup-toolchains --detect
|
||||
- qbs config --list profiles
|
||||
|
|
|
|||
Loading…
Reference in a new issue