Skip to content

Commit be19998

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/main' into esp32-displayio-fix
2 parents 4733a67 + 66cf6c4 commit be19998

161 files changed

Lines changed: 12434 additions & 1087 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ jobs:
234234
- "makerdiary_nrf52840_m2_devkit"
235235
- "makerdiary_nrf52840_mdk"
236236
- "makerdiary_nrf52840_mdk_usb_dongle"
237+
- "matrixportal_m4"
237238
- "meowbit_v121"
238239
- "meowmeow"
239240
- "metro_m0_express"
@@ -408,8 +409,11 @@ jobs:
408409
fail-fast: false
409410
matrix:
410411
board:
412+
- "electroniccats_bastwifi"
413+
- "espressif_kaluga_1"
411414
- "espressif_saola_1_wroom"
412415
- "espressif_saola_1_wrover"
416+
- "microdev_micro_s2"
413417
- "unexpectedmaker_feathers2"
414418

415419
steps:
@@ -430,6 +434,11 @@ jobs:
430434
with:
431435
path: ${{ github.workspace }}/.idf_tools
432436
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20200801
437+
- name: Clone IDF submodules
438+
run: |
439+
(cd $IDF_PATH && git submodule update --init)
440+
env:
441+
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
433442
- name: Install IDF tools
434443
run: |
435444
$IDF_PATH/tools/idf_tools.py --non-interactive install required

‎conf.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
# Grab the JSON values to use while building the module support matrix
4343
# in 'shared-bindings/index.rst'
4444

45+
# The stubs must be built before we calculate the shared bindings matrix
46+
subprocess.check_output(["make", "stubs"])
47+
4548
#modules_support_matrix = shared_bindings_matrix.support_matrix_excluded_boards()
4649
modules_support_matrix = shared_bindings_matrix.support_matrix_by_board()
4750

@@ -77,7 +80,6 @@
7780
'.md': 'markdown',
7881
}
7982

80-
subprocess.check_output(["make", "stubs"])
8183
extensions.append('autoapi.extension')
8284

8385
autoapi_type = 'python'

0 commit comments

Comments
 (0)