Unverified Commit 248919fa authored by xster's avatar xster Committed by GitHub

More Travis deploy script fixes (#14549)

* More restricted versioning on iOS

* Escape the key base64 and don't echo it back on travis

* Have match not print back the cert url
parent 97e77932
...@@ -25,9 +25,11 @@ if [ -n "$TRAVIS" ]; then ...@@ -25,9 +25,11 @@ if [ -n "$TRAVIS" ]; then
export ANDROID_HOME=`pwd`/android-sdk export ANDROID_HOME=`pwd`/android-sdk
export PATH=`pwd`/android-sdk/tools/bin:$PATH export PATH=`pwd`/android-sdk/tools/bin:$PATH
mkdir -p /home/travis/.android # silence sdkmanager warning mkdir -p /home/travis/.android # silence sdkmanager warning
set +x # Travis's env variable hiding is a bit wonky. Don't echo back this line.
if [ -n "$ANDROID_GALLERY_UPLOAD_KEY" ]; then if [ -n "$ANDROID_GALLERY_UPLOAD_KEY" ]; then
echo $ANDROID_GALLERY_UPLOAD_KEY | base64 --decode > /home/travis/.android/debug.keystore echo "$ANDROID_GALLERY_UPLOAD_KEY" | base64 --decode > /home/travis/.android/debug.keystore
fi fi
set -x
echo 'count=0' > /home/travis/.android/repositories.cfg # silence sdkmanager warning echo 'count=0' > /home/travis/.android/repositories.cfg # silence sdkmanager warning
# suppressing output of sdkmanager to keep log under 4MB (travis limit) # suppressing output of sdkmanager to keep log under 4MB (travis limit)
echo y | sdkmanager "tools" >/dev/null echo y | sdkmanager "tools" >/dev/null
......
...@@ -15,16 +15,21 @@ platform :ios do ...@@ -15,16 +15,21 @@ platform :ios do
# Doesn't do anything when not on Travis. # Doesn't do anything when not on Travis.
setup_travis setup_travis
# Relative to this file.
raw_version = File.read('../../../../version')
puts "Building and deploying version #{raw_version}..."
increment_version_number( increment_version_number(
# Relative to this file. Accept only digits and dots. # Only major, minor, patch digits and dots.
version_number: File.read('../../../../version').gsub(/[^0-9\.]/, '') version_number: /\d+\.\d+\.\d+/.match(raw_version)[0]
) )
# Retrieves all the necessary certs and provisioning profiles. # Retrieves all the necessary certs and provisioning profiles.
sync_code_signing( sync_code_signing(
git_url: ENV['PUBLISHING_MATCH_CERTIFICATE_REPO'], git_url: ENV['PUBLISHING_MATCH_CERTIFICATE_REPO'],
type: 'appstore', type: 'appstore',
readonly: true readonly: true,
verbose: false
) )
# Modify the Xcode project to use the new team and profile. # Modify the Xcode project to use the new team and profile.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment