Merge branch 'main' into new-terraform

ChainSafe · Nov 3, 2023 · 484a57b · 484a57b
2 parents 5794bf9 + c272afc
commit 484a57b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/terraform/daily_snapshot/prod/main.tf b/terraform/daily_snapshot/prod/main.tf
@@ -33,7 +33,7 @@ module "daily_snapshot" {
   size            = "s-4vcpu-16gb-amd"      # droplet size
   slack_channel   = "#forest-notifications" # slack channel for notifications
   snapshot_bucket = "forest-archive"
-  forest_tag      = "latest"
+  forest_tag      = "v0.15.0"
   r2_endpoint     = "https://2238a825c5aca59233eab1f221f7aefb.r2.cloudflarestorage.com/"
 
   # Variable passthrough:

diff --git a/terraform/modules/daily_snapshot/service/upload_snapshot.sh b/terraform/modules/daily_snapshot/service/upload_snapshot.sh
@@ -63,13 +63,13 @@ forest-tool db destroy --force --config config.toml --chain "$CHAIN_NAME"
 
 forest --config config.toml --chain "$CHAIN_NAME" --auto-download-snapshot --halt-after-import
 forest --config config.toml --chain "$CHAIN_NAME" --no-gc --save-token=token.txt --detach
-timeout "$SYNC_TIMEOUT" forest-cli --chain "$CHAIN_NAME" sync wait
+timeout "$SYNC_TIMEOUT" forest-cli sync wait
 # Forest isn't waiting until fully synced. Tracking issue: https://github.com/ChainSafe/forest/issues/3540
 # Calling 'sync wait' multiple times is a work-around.
-timeout "$SYNC_TIMEOUT" forest-cli --chain "$CHAIN_NAME" sync wait
-timeout "$SYNC_TIMEOUT" forest-cli --chain "$CHAIN_NAME" sync wait
-timeout "$SYNC_TIMEOUT" forest-cli --chain "$CHAIN_NAME" sync wait
-forest-cli --chain "$CHAIN_NAME" snapshot export -o forest_db/
+timeout "$SYNC_TIMEOUT" forest-cli sync wait
+timeout "$SYNC_TIMEOUT" forest-cli sync wait
+timeout "$SYNC_TIMEOUT" forest-cli sync wait
+forest-cli snapshot export -o forest_db/
 forest-cli --token=\$(cat token.txt) shutdown --force
 
 # Run full checks only for calibnet, given that it takes too long for mainnet.