Skip to content

Commit

Permalink
Fix bootstrap on M1/M2 mac. (#28609)
Browse files Browse the repository at this point in the history
#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.

The action fixes are to make sure that for boufallolab CI we end up doing
bootstrap with the right -p parameter to pull in requirements.bouffalolab.txt
there.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Aug 21, 2023
1 parent a636226 commit 3809206
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .github/actions/bootstrap/action.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
name: Bootstrap
description: Bootstrap
inputs:
platform:
description: "Platform name"
required: false
default: none
runs:
using: "composite"
steps:
- name: Bootstrap
shell: bash
run: bash scripts/bootstrap.sh
run: bash scripts/bootstrap.sh -p ${{ inputs.platform }}
2 changes: 2 additions & 0 deletions .github/actions/checkout-submodules-and-bootstrap/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ runs:
uses: ./.github/actions/bootstrap-cache
- name: Bootstrap
uses: ./.github/actions/bootstrap
with:
platform: ${{ 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 3809206

Please sign in to comment.