Skip to content

Commit 4847c19

Browse files
authoredDec 14, 2023
fix: build scripts if statements (AztecProtocol#3700)
- Fix check for dry deploy - always run terraform if we've marked resource to taint
1 parent 4711ef7 commit 4847c19

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed
 

‎build-system/scripts/deploy_terraform_services

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ cd $PROJECT_DIR
2424
# Bail out if nothing changed.
2525
CONTENT_HASH=$(calculate_content_hash $CHECK_REBUILD_REPOSITORY)
2626
echo "Last successfully deployed commit: $CONTENT_HASH"
27-
if check_rebuild cache-$CONTENT_HASH-$DEPLOY_TAG-deployed $CHECK_REBUILD_REPOSITORY; then
27+
if [ -z "$TO_TAINT" ] && check_rebuild cache-$CONTENT_HASH-$DEPLOY_TAG-deployed $CHECK_REBUILD_REPOSITORY; then
2828
echo "No changes detected, skipping deployment."
2929
exit 0
3030
fi

‎l1-contracts/scripts/ci_deploy_contracts.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ for KEY in ROLLUP_CONTRACT_ADDRESS REGISTRY_CONTRACT_ADDRESS INBOX_CONTRACT_ADDR
3333
export TF_VAR_$KEY=$VALUE
3434
done
3535

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

0 commit comments

Comments
 (0)