Skip to content

Commit

Permalink
fix: build scripts if statements (AztecProtocol#3700)
Browse files Browse the repository at this point in the history
- Fix check for dry deploy
- always run terraform if we've marked resource to taint
  • Loading branch information
spypsy committed Dec 14, 2023
1 parent 4711ef7 commit 4847c19
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build-system/scripts/deploy_terraform_services
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cd $PROJECT_DIR
# Bail out if nothing changed.
CONTENT_HASH=$(calculate_content_hash $CHECK_REBUILD_REPOSITORY)
echo "Last successfully deployed commit: $CONTENT_HASH"
if check_rebuild cache-$CONTENT_HASH-$DEPLOY_TAG-deployed $CHECK_REBUILD_REPOSITORY; then
if [ -z "$TO_TAINT" ] && check_rebuild cache-$CONTENT_HASH-$DEPLOY_TAG-deployed $CHECK_REBUILD_REPOSITORY; then
echo "No changes detected, skipping deployment."
exit 0
fi
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/scripts/ci_deploy_contracts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ for KEY in ROLLUP_CONTRACT_ADDRESS REGISTRY_CONTRACT_ADDRESS INBOX_CONTRACT_ADDR
export TF_VAR_$KEY=$VALUE
done

if [ -n "${DRY_DEPLOY:-}" ]; then
if [ "$DRY_DEPLOY" -eq 1 ]; then
echo "DRY_DEPLOY: deploy_terraform l1-contracts ./terraform"
echo "DRY_DEPLOY: tag_remote_image $REPOSITORY cache-$CONTENT_HASH cache-$CONTENT_HASH-$DEPLOY_TAG-deployed"
else
Expand Down

0 comments on commit 4847c19

Please sign in to comment.