add echos and unblock stdout
Change-Id: Ifc9ec2a58e01c33964ffc020aa748f74e6f4ba70
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/56801
Reviewed-by: Xilai Zhang <xilaizhang@google.com>
Commit-Queue: Christopher Fujino <fujino@google.com>
diff --git a/recipe_modules/signing/api.py b/recipe_modules/signing/api.py
index d42e157..9ddc115 100644
--- a/recipe_modules/signing/api.py
+++ b/recipe_modules/signing/api.py
@@ -110,7 +110,6 @@
with self.m.context(env=env, env_prefixes=env_prefixes):
self.m.step(
'run keychain setup script', [resource_name],
- stdout=self.m.raw_io.output_text()
)
def _signer_tasks(self, env, env_prefixes, files_to_sign):
diff --git a/recipe_modules/signing/resources/setup_keychain.sh b/recipe_modules/signing/resources/setup_keychain.sh
index 52a36c8..b7906c1 100644
--- a/recipe_modules/signing/resources/setup_keychain.sh
+++ b/recipe_modules/signing/resources/setup_keychain.sh
@@ -32,22 +32,31 @@
# Add keychain name to search list. (FML, took me 5 days to hunt this down)
/usr/bin/security -v list-keychains -s "${keychainNames[@]}" build.keychain
+echo "about to set build.keychain as default"
+
# Set build.keychain as default.
/usr/bin/security default-keychain -s build.keychain
+echo "about to unlock build.keychain"
+
# Unlock build.keychain to allow sign commands to use its certs.
/usr/bin/security unlock-keychain -p '' build.keychain
attempt=0
sleep_time=2
while [ $attempt -lt 3 ]; do
+ echo "attempt #$attempt"
/usr/bin/security import $P12_SUFFIX_FILEPATH -k build.keychain -P $RAW_PASSWORD -T $CODESIGN_PATH -T /usr/bin/codesign
/usr/bin/security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k '' build.keychain
- if /usr/bin/security find-identity -v build.keychain | grep 'FLUTTER.IO LLC'; then
+ $IDENTITY_OUTPUT=$(/usr/bin/security find-identity -v build.keychain)
+ echo "$IDENTITY_OUTPUT"
+ if echo "$IDENTITY_OUTPUT" | grep 'FLUTTER.IO LLC'; then
exit 0
fi
sleep $sleep_time
attempt=$(( attempt + 1 ))
sleep_time=$(( sleep_time * sleep_time ))
done
-exit 1
\ No newline at end of file
+
+echo "exhausted retries, exiting 1"
+exit 1
