commit 1d2ffdf48b0b09401d5d035dc5ca781d621f98f6
author Rob Mohr <mohrr@google.com> Wed May 12 14:44:45 2021 -0700
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon May 17 16:30:51 2021 +0000
tree 8e20a5076179895128fca76240d43d5fc7e0f5ac
parent e533e72f49e8780a3135ae58c2ef0ed55be06568

pw_env_setup: Always generate actions.json

Change-Id: If6daa829641c83a6f1411fa48d5de1529da37b6c
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/45020
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: Armando Montanez <amontanez@google.com>
Reviewed-by: Anthony DiGirolamo <tonymd@google.com>

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 589b3a2..99dcad0 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -89,7 +89,7 @@
 if [ "$(basename "$_PW_BOOTSTRAP_PATH")" = "bootstrap.sh" ] || \
   [ ! -f "$SETUP_SH" ] || \
   [ ! -s "$SETUP_SH" ]; then
-  pw_bootstrap --shell-file "$SETUP_SH" --install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" --json-file "$_PW_ACTUAL_ENVIRONMENT_ROOT/actions.json" --config-file "$PW_ROOT/pw_env_setup/config.json"
+  pw_bootstrap --shell-file "$SETUP_SH" --install-dir "$_PW_ACTUAL_ENVIRONMENT_ROOT" --config-file "$PW_ROOT/pw_env_setup/config.json"
   pw_finalize bootstrap "$SETUP_SH"
 else
   pw_activate