Skip to content

Commit

Permalink
Compile fixes for CI for v1.1-branch (#33293)
Browse files Browse the repository at this point in the history
* Fix builds to macos-13 rather than latest due to bootstrap python incompatibilities (#33142)

* Fix google-api-core (#32687)

* [ESP32] bump the component manager version (#32474)

* [ESP32] bump the component manager version

* Update requirements.esp32.txt

* Update requirements.esp32.txt

* fix the version in constraints.txt

* Bump prompt-toolkit requirement to fix ptpython version update (#30987)

* Undo protobuf constraint fixing - make requirements and constraints equal

---------

Co-authored-by: Shubham Patil <[email protected]>
Co-authored-by: Andrei Litvin <[email protected]>
  • Loading branch information
3 people authored May 3, 2024
1 parent 3c808ab commit 651298b
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ jobs:
build_darwin:
name: Build on Darwin (clang, python_lib, simulated)
timeout-minutes: 200
runs-on: macos-latest
runs-on: macos-13
if: github.actor != 'restyled-io[bot]'

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt

if: github.actor != 'restyled-io[bot]'
runs-on: macos-latest
runs-on: macos-13

steps:
- uses: Wandalen/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
timeout-minutes: 210

if: github.actor != 'restyled-io[bot]'
runs-on: macos-latest
runs-on: macos-13

steps:
- uses: Wandalen/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fuzzing-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
build_darwin_fuzzing:
name: Build on Darwin
timeout-minutes: 90
runs-on: macos-latest
runs-on: macos-13
if: github.actor != 'restyled-io[bot]'

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/smoketest-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
timeout-minutes: 60

if: github.actor != 'restyled-io[bot]'
runs-on: macos-latest
runs-on: macos-13

steps:
- uses: Wandalen/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ jobs:
LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt

if: github.actor != 'restyled-io[bot]'
runs-on: macos-latest
runs-on: macos-13

steps:
- uses: Wandalen/[email protected]
Expand Down Expand Up @@ -700,7 +700,7 @@ jobs:
TSAN_OPTIONS: "halt_on_error=1"

if: github.actor != 'restyled-io[bot]' && false
runs-on: macos-latest
runs-on: macos-13

steps:
- name: Checkout
Expand Down
11 changes: 7 additions & 4 deletions scripts/setup/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ greenlet==2.0.2
# via gevent
humanfriendly==10.0
# via coloredlogs
idf-component-manager==1.2.2
idf-component-manager==1.5.2
# via -r requirements.esp32.txt
idna==3.4
# via requests
Expand Down Expand Up @@ -234,9 +234,6 @@ portpicker==1.5.2
# -r requirements.txt
# mobly
prettytable==2.5.0
# via
# mbed-ls
# mbed-os-tools
prompt-toolkit==3.0.43
# via ipython
protobuf==3.20.1
Expand Down Expand Up @@ -419,3 +416,9 @@ wheel==0.38.4 ; sys_platform == "linux"
# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
#
# Manual edits:
# Higher versions depend on proto-plus, which break
# nanopb code generation (due to name conflict of the 'proto' module)
google-api-core==2.17.0

0 comments on commit 651298b

Please sign in to comment.