Skip to content

Commit 651298b

Browse files
andy31415shubhamdpandreilitvin
authored
Compile fixes for CI for v1.1-branch (#33293)
* 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 <shubham.patil@espressif.com> Co-authored-by: Andrei Litvin <andreilitvin@google.com>
1 parent 3c808ab commit 651298b

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ jobs:
382382
build_darwin:
383383
name: Build on Darwin (clang, python_lib, simulated)
384384
timeout-minutes: 200
385-
runs-on: macos-latest
385+
runs-on: macos-13
386386
if: github.actor != 'restyled-io[bot]'
387387

388388
steps:

.github/workflows/darwin-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
4343

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

4747
steps:
4848
- uses: Wandalen/wretry.action@v1.0.36

.github/workflows/darwin.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
timeout-minutes: 210
3131

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

3535
steps:
3636
- uses: Wandalen/wretry.action@v1.0.36

.github/workflows/fuzzing-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
build_darwin_fuzzing:
9696
name: Build on Darwin
9797
timeout-minutes: 90
98-
runs-on: macos-latest
98+
runs-on: macos-13
9999
if: github.actor != 'restyled-io[bot]'
100100

101101
steps:

.github/workflows/smoketest-darwin.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
timeout-minutes: 60
3131

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

3535
steps:
3636
- uses: Wandalen/wretry.action@v1.0.36

.github/workflows/tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ jobs:
312312
LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
313313

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

317317
steps:
318318
- uses: Wandalen/wretry.action@v1.0.36
@@ -700,7 +700,7 @@ jobs:
700700
TSAN_OPTIONS: "halt_on_error=1"
701701

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

705705
steps:
706706
- name: Checkout

scripts/setup/constraints.txt

+7-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ greenlet==2.0.2
130130
# via gevent
131131
humanfriendly==10.0
132132
# via coloredlogs
133-
idf-component-manager==1.2.2
133+
idf-component-manager==1.5.2
134134
# via -r requirements.esp32.txt
135135
idna==3.4
136136
# via requests
@@ -234,9 +234,6 @@ portpicker==1.5.2
234234
# -r requirements.txt
235235
# mobly
236236
prettytable==2.5.0
237-
# via
238-
# mbed-ls
239-
# mbed-os-tools
240237
prompt-toolkit==3.0.43
241238
# via ipython
242239
protobuf==3.20.1
@@ -419,3 +416,9 @@ wheel==0.38.4 ; sys_platform == "linux"
419416
# The following packages are considered to be unsafe in a requirements file:
420417
# pip
421418
# setuptools
419+
#
420+
# Manual edits:
421+
# Higher versions depend on proto-plus, which break
422+
# nanopb code generation (due to name conflict of the 'proto' module)
423+
google-api-core==2.17.0
424+

0 commit comments

Comments
 (0)