Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v1.2] Fix bootstrapping #34477

Merged
merged 2 commits into from
Jul 26, 2024
Merged

[v1.2] Fix bootstrapping #34477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e8f09
Fix bootstrap if repository path contains symlinks. (#32945)
bzbarsky-apple Apr 12, 2024
9952090
Bump python versions to fix bootstrapping
shubhamdp Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions scripts/setup/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,20 @@ EOF
# bootstrap or run_in_build_env.sh can be executed in a build env
_ORIGINAL_PW_ENVIRONMENT_ROOT="$PW_ENVIRONMENT_ROOT"

# pigweed does not seem to handle pwd involving symlinks very well.
original_pwd=$PWD
if hash realpath 2>/dev/null; then
realpwd="$(realpath "$PWD")"
if [ "$realpwd" != "$PWD" ]; then
echo "Warning: $PWD contains symlinks, using $realpwd instead"
cd "$realpwd"
fi
fi

_bootstrap_or_activate "$0"

cd $original_pwd

if [ "$_ACTION_TAKEN" = "bootstrap" ]; then
# By default, install all extra pip dependencies even if slow. -p/--platform
# arguments may override this default.
Expand Down
4 changes: 2 additions & 2 deletions scripts/setup/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ colorama==0.4.6
# west
coloredlogs==15.0.1
# via -r requirements.all.txt
construct==2.10.54
construct==2.10.70
# via
# -r requirements.esp32.txt
# esp-coredump
Expand Down Expand Up @@ -208,7 +208,7 @@ python-socketio==4.6.1
# via -r requirements.esp32.txt
pytz==2022.7.1
# via pandas
pyyaml==6.0
pyyaml==6.0.1
# via
# esptool
# idf-component-manager
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup/requirements.esp32.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pygdbmi<=0.9.0.2
reedsolo>=1.5.3,<=1.5.4
bitstring>=3.1.6,<4
ecdsa>=0.16.0
construct==2.10.54
construct==2.10.70
python-socketio<5
itsdangerous<2.1 ; python_version < "3.11"
esp_idf_monitor==1.1.1
Expand Down
Loading