From 6640dd7427ef537355be278991fe679d09177cd6 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 9 Aug 2023 11:59:18 -0400 Subject: [PATCH] Fix bootstrap on M1/M2 mac. https://github.com/project-chip/connectedhomeip/pull/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. --- .github/actions/checkout-submodules-and-bootstrap/action.yaml | 2 +- scripts/setup/requirements.all.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/checkout-submodules-and-bootstrap/action.yaml b/.github/actions/checkout-submodules-and-bootstrap/action.yaml index 22b3629f0e7052..9e9fffac3f79ae 100644 --- a/.github/actions/checkout-submodules-and-bootstrap/action.yaml +++ b/.github/actions/checkout-submodules-and-bootstrap/action.yaml @@ -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: diff --git a/scripts/setup/requirements.all.txt b/scripts/setup/requirements.all.txt index 378959cce0f17e..b604dd369b727b 100644 --- a/scripts/setup/requirements.all.txt +++ b/scripts/setup/requirements.all.txt @@ -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