Skip to content

Commit

Permalink
Allow using no CIPD pigweed configuration when activating (#20105)
Browse files Browse the repository at this point in the history
* Allow to set pigweed config via environment

Allow to specify custom pigweed configuration file via PW_CONFIG_FILE,
e.g.
PW_CONFIG_FILE=scripts/environment_no_cipd.json source scripts/bootstrap.sh

This allows to use a custom pigweed config for scripts/activate.sh as
well.

* Disable rosetta in no_cipd config as well
  • Loading branch information
agners authored and pull[bot] committed Jan 17, 2024
1 parent 84acf25 commit 1316802
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ _bootstrap_or_activate() {

local _CONFIG_FILE="scripts/environment.json"

if [ "$_BOOTSTRAP_NAME" = "no_cipd_bootstrap.sh" ]; then
_CONFIG_FILE="scripts/environment_no_cipd.json"
_BOOTSTRAP_NAME="bootstrap.sh"
if [ ! -z "$PW_CONFIG_FILE" ]; then
_CONFIG_FILE="$PW_CONFIG_FILE"
fi

if [ "$_BOOTSTRAP_NAME" = "bootstrap.sh" ] ||
Expand Down
1 change: 1 addition & 0 deletions scripts/environment_no_cipd.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"gn_targets": [":python_packages.install"]
},
"required_submodules": ["third_party/pigweed/repo"],
"rosetta": "never",
"gni_file": "build_overrides/pigweed_environment.gni"
}
1 change: 0 additions & 1 deletion scripts/no_cipd_bootstrap.sh

This file was deleted.

0 comments on commit 1316802

Please sign in to comment.