Skip to content

Commit

Permalink
Fix bootstrap on M1/M2 mac.
Browse files Browse the repository at this point in the history
project-chip#28146 added bitarray to
requirements.bouffalolab.txt, but that package requires native compilation
during bootstrap.  And bootstrap ends up using the pigweed-provided clang for
that, but that clang is broken on M1/M2 mac.

For now, stop pulling requirements.bouffalolab.txt into the general
requirements.all.txt, so that bootstrap works for all the people not actively
developing for bouffalolab.  If it's re-added there later, it should be split up
to make sure the bitarray bits are not pulled in.
  • Loading branch information
bzbarsky-apple committed Aug 9, 2023
1 parent e05fc6e commit 6640dd7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
- name: Bootstrap Cache
uses: ./.github/actions/bootstrap-cache
- name: Bootstrap
uses: ./.github/actions/bootstrap
uses: ./.github/actions/bootstrap -p ${{ inputs.platform }}
- name: Upload Bootstrap Logs
uses: ./.github/actions/upload-bootstrap-logs
with:
Expand Down
1 change: 0 additions & 1 deletion scripts/setup/requirements.all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ virtualenv
-r requirements.esp32.txt

-r requirements.mbed.txt
-r requirements.bouffalolab.txt
-r requirements.openiotsdk.txt
-r requirements.infineon.txt
-r requirements.ti.txt
Expand Down

0 comments on commit 6640dd7

Please sign in to comment.