diff options
| author | Angus Gratton <angus@redyak.com.au> | 2025-02-12 16:46:43 +1100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2025-02-25 15:13:13 +1100 |
| commit | 8b1ed4473dd215d564498f577cb6f3339c3c2e57 (patch) | |
| tree | 3a37af2015a61238af638bc2980922707e8c85ed | |
| parent | 7e9d19e06b9ee1c4023a0d24f06afe30d82148ea (diff) | |
github/workflows: Include the Python version in the ESP-IDF cache key.
Changing runner OS can change Python version, and ESP-IDF installs are
keyed on ESP-IDF and Python version together.
Signed-off-by: Angus Gratton <angus@redyak.com.au>
| -rw-r--r-- | .github/workflows/ports_esp32.yml | 4 | ||||
| -rwxr-xr-x | tools/ci.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml index 0d76974f0..4c07f8943 100644 --- a/.github/workflows/ports_esp32.yml +++ b/.github/workflows/ports_esp32.yml @@ -30,8 +30,8 @@ jobs: - uses: actions/checkout@v4 - id: idf_ver - name: Read the ESP-IDF version - run: source tools/ci.sh && echo "IDF_VER=$IDF_VER" | tee "$GITHUB_OUTPUT" + name: Read the ESP-IDF version (including Python version) + run: source tools/ci.sh && echo "IDF_VER=${IDF_VER}-py${PYTHON_VER}" | tee "$GITHUB_OUTPUT" - name: Cached ESP-IDF install id: cache_esp_idf diff --git a/tools/ci.sh b/tools/ci.sh index 9125b5bc9..5b108d620 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -140,6 +140,7 @@ function ci_cc3200_build { # GitHub tag of ESP-IDF to use for CI (note: must be a tag or a branch) IDF_VER=v5.2.2 +PYTHON_VER=$(python --version | cut -d' ' -f2) export IDF_CCACHE_ENABLE=1 |