fix: add retry to tag and docker actions (#2099)

We seem to get throttled around actions to do with our images and tags.
AztecProtocol · Sep 7, 2023 · 8facb9e · 8facb9e
1 parent ca42322
commit 8facb9e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/cpp/scripts/bb-tests.sh b/cpp/scripts/bb-tests.sh
@@ -4,10 +4,11 @@
 set -eu
 
 $(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
+export PATH="$PATH:$(git rev-parse --show-toplevel)/build-system/scripts"
 REPOSITORY=barretenberg-x86_64-linux-clang-assert
 # use the image rebuild patterns to compute a content hash, use this to get a URI
-IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri $REPOSITORY)
-docker pull $IMAGE_URI
+IMAGE_URI=$(calculate_image_uri $REPOSITORY)
+retry docker pull $IMAGE_URI
 
 TESTS=(
   crypto_aes128_tests

diff --git a/cpp/scripts/run_aztec_circuits_tests b/cpp/scripts/run_aztec_circuits_tests
@@ -19,9 +19,10 @@ shift # to aztec's circuits `run_tests_local`
 
 $(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
 
+export PATH="$PATH:$(git rev-parse --show-toplevel)/build-system/scripts"
 REPOSITORY="barretenberg-circuits-${ARCH}-linux-clang-builder-runner"
-IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri $REPOSITORY)
-docker pull $IMAGE_URI
+IMAGE_URI=$(calculate_image_uri $REPOSITORY)
+retry docker pull $IMAGE_URI
 
 if [ "$ARCH" != "wasm" ]; then
   # x86_64 / anything other than wasm

diff --git a/cpp/scripts/run_tests b/cpp/scripts/run_tests
@@ -14,8 +14,9 @@ $(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
 
 # use the image rebuild patterns to compute a content hash, use this to get a URI
 REPOSITORY=barretenberg-x86_64-linux-clang-assert
-IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri $REPOSITORY)
-docker pull $IMAGE_URI
+export PATH="$PATH:$(git rev-parse --show-toplevel)/build-system/scripts"
+IMAGE_URI=$(calculate_image_uri $REPOSITORY)
+retry docker pull $IMAGE_URI
 
 if [ -f "$TESTS" ]; then
   TESTS=$(cat $TESTS | tr '\n' ' ')

diff --git a/cpp/src/barretenberg/bb/main.cpp b/cpp/src/barretenberg/bb/main.cpp
@@ -174,7 +174,7 @@ void writeVk(const std::string& bytecodePath, const std::string& outputPath)
  * - Filesystem: The Solidity verifier contract is written to the path specified by outputPath
  *
  * Note: The fact that the contract was computed is for an ACIR circuit is not of importance
- * because this method uses the verification key to compute the Solidity verifier contract.
+ * because this method uses the verification key to compute the Solidity verifier contract
  *
  * @param output_path Path to write the contract to
  * @param vk_path Path to the file containing the serialized verification key