Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jan 13, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2375fd
chore: bump kontrol version, and make output checks more robust
mds1 Jan 10, 2025
301128f
chore: remove outdated block
mds1 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mise.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ anvil = "nightly-59f354c179f4e7f6d7292acb3d068815c79286d1"
# 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.
asterisc = "1.2.0"
kontrol = "1.0.53"
kontrol = "1.0.90"
binary_signer = "1.0.4"

[alias]
Expand Down
22 changes: 8 additions & 14 deletions packages/contracts-bedrock/test/kontrol/scripts/run-kontrol.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,29 +183,23 @@ trap clean_docker EXIT
conditionally_start_docker

results=()

# Run kontrol_build and store the result
kontrol_build
results[0]=$?
if [ "${results[0]}" -ne 0 ]; then
echo "Kontrol Build Failed"
exit 1
fi

# Run kontrol_prove and store the result
kontrol_prove
results[1]=$?

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
if [ "${results[1]}" -ne 0 ]; then
echo "Kontrol Prove Failed"
exit 2
else
echo "Kontrol Passed"
fi

get_log_results
echo "Kontrol Passed"
notif "DONE"