Commit 93c62d43 authored by Matt Solomon's avatar Matt Solomon Committed by GitHub

chore: bump kontrol version, and make output checks more robust (#13697)

* chore: bump kontrol version, and make output checks more robust

* chore: remove outdated block
parent 37c44291
...@@ -40,7 +40,7 @@ anvil = "nightly-59f354c179f4e7f6d7292acb3d068815c79286d1" ...@@ -40,7 +40,7 @@ anvil = "nightly-59f354c179f4e7f6d7292acb3d068815c79286d1"
# actually be managed by mise (yet). Make sure that anything you put in here is # actually be managed by mise (yet). Make sure that anything you put in here is
# also found inside of disabled_tools or mise will try to install it. # also found inside of disabled_tools or mise will try to install it.
asterisc = "1.2.0" asterisc = "1.2.0"
kontrol = "1.0.53" kontrol = "1.0.90"
binary_signer = "1.0.4" binary_signer = "1.0.4"
[alias] [alias]
......
...@@ -183,29 +183,23 @@ trap clean_docker EXIT ...@@ -183,29 +183,23 @@ trap clean_docker EXIT
conditionally_start_docker conditionally_start_docker
results=() results=()
# Run kontrol_build and store the result # Run kontrol_build and store the result
kontrol_build kontrol_build
results[0]=$? results[0]=$?
if [ "${results[0]}" -ne 0 ]; then
echo "Kontrol Build Failed"
exit 1
fi
# Run kontrol_prove and store the result # Run kontrol_prove and store the result
kontrol_prove kontrol_prove
results[1]=$? results[1]=$?
if [ "${results[1]}" -ne 0 ]; then
get_log_results
# Now you can use ${results[0]} and ${results[1]}
# to check the results of kontrol_build and kontrol_prove, respectively
if [ "${results[0]}" -ne 0 ] && [ "${results[1]}" -ne 0 ]; then
echo "Kontrol Build and Prove Failed"
exit 1
elif [ "${results[0]}" -ne 0 ]; then
echo "Kontrol Build Failed"
exit 1
elif [ "${results[1]}" -ne 0 ]; then
echo "Kontrol Prove Failed" echo "Kontrol Prove Failed"
exit 2 exit 2
else
echo "Kontrol Passed"
fi fi
get_log_results
echo "Kontrol Passed"
notif "DONE" notif "DONE"
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