From b8f5def9859f74430f39579718c579373e2406c5 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 13 Nov 2022 09:26:16 -0600
Subject: [PATCH 1/3] return to using python 3.x for builds

---
 .github/workflows/build.yml             | 2 +-
 .github/workflows/create_website_pr.yml | 2 +-
 .github/workflows/pre-commit.yml        | 2 +-
 ports/espressif/esp-idf                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0dc47946b5..92e6600f56 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.x"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py test ${{ github.sha }}
     - name: CircuitPython version
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
index 1658fe092c..75de556c68 100644
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.x"
     - name: Get CP deps
       run: python tools/ci_fetch_deps.py website ${{ github.sha }}
     - name: Install deps
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 556f89e63c..a23dcd1d11 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up Python 3
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.x"
     - name: Install deps
       run: |
         sudo apt-get install -y gettext uncrustify
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index 716d8531d7..dbb2d88eb8 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 716d8531d71b122975e2966a24ec7613b87eb7b0
+Subproject commit dbb2d88eb8a90a314d6f2e7b0af71925802c552e

From dec802a73b726ef3cee60b4aef0c7dd79964b5b2 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 13 Nov 2022 13:26:35 -0600
Subject: [PATCH 2/3] build docs when .github/workflows changes

Closes: #7205
---
 tools/ci_set_matrix.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci_set_matrix.py b/tools/ci_set_matrix.py
index f22840fad7..2629942383 100755
--- a/tools/ci_set_matrix.py
+++ b/tools/ci_set_matrix.py
@@ -215,7 +215,7 @@ def set_docs_to_build(build_all):
     doc_match = build_all
     if not build_all:
         doc_pattern = re.compile(
-            r"^(?:docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
+            r"^(?:.github/workflows/|docs|extmod/ulab|(?:(?:ports/\w+/bindings|shared-bindings)\S+\.c|conf\.py|tools/extract_pyi\.py|requirements-doc\.txt)$)|(?:-stubs|\.(?:md|MD|rst|RST))$"
         )
         for p in changed_files:
             if doc_pattern.search(p):

From e489b73d88fa38e6d4ddff6d6537db120010aee1 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 30 Nov 2022 12:04:47 -0600
Subject: [PATCH 3/3] update esp-idf to merge commit

---
 ports/espressif/esp-idf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
index dbb2d88eb8..26716e006d 160000
--- a/ports/espressif/esp-idf
+++ b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit dbb2d88eb8a90a314d6f2e7b0af71925802c552e
+Subproject commit 26716e006d68e5a584ac29b85d9e2979563fc827