From 928467a549544beec319669fb70cc0f8954707e0 Mon Sep 17 00:00:00 2001 From: mikee47 Date: Tue, 2 Jul 2024 15:13:58 +0100 Subject: [PATCH] Don't share caches between OSes --- .github/workflows/ci-esp32.yml | 15 +++++---------- .github/workflows/library.yml | 16 +++++----------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci-esp32.yml b/.github/workflows/ci-esp32.yml index f4e8e46397..35f177364d 100644 --- a/.github/workflows/ci-esp32.yml +++ b/.github/workflows/ci-esp32.yml @@ -67,18 +67,13 @@ jobs: run: | sudo chown $USER /opt - - name: Cache ESP-IDF + - name: Cache ESP-IDF and build tools uses: actions/cache@v4 with: - path: /opt/esp-idf-${{ matrix.idf_version }} - key: idf-${{ matrix.idf_version }} - enableCrossOsArchive: true - - - name: Cache build tools - uses: actions/cache@v4 - with: - path: /opt/esp32 - key: ${{ matrix.os }}-esp32-${{ matrix.idf_version }} + path: | + /opt/esp-idf-${{ matrix.idf_version }} + /opt/esp32 + key: ${{ matrix.os }}-idf-${{ matrix.idf_version }} - name: Install build tools for Ubuntu / MacOS if: ${{ matrix.os != 'windows-latest' }} diff --git a/.github/workflows/library.yml b/.github/workflows/library.yml index e7e22428bf..295da95f56 100644 --- a/.github/workflows/library.yml +++ b/.github/workflows/library.yml @@ -111,20 +111,14 @@ jobs: run: | sudo chown $USER /opt - - name: Cache ESP-IDF + - name: Cache ESP-IDF and build tools if: ${{ matrix.arch == 'Esp32' }} uses: actions/cache@v4 with: - path: /opt/esp-idf-${{ env.INSTALL_IDF_VER }} - key: idf-${{ env.INSTALL_IDF_VER }} - enableCrossOsArchive: true - - - name: Cache IDF build tools - if: ${{ matrix.arch == 'Esp32' }} - uses: actions/cache@v4 - with: - path: /opt/esp32 - key: ${{ matrix.os }}-esp32-${{ env.INSTALL_IDF_VER }} + path: | + /opt/esp-idf-${{ env.INSTALL_IDF_VER }} + /opt/esp32 + key: ${{ matrix.os }}-idf-${{ env.INSTALL_IDF_VER }} - name: Install build tools for Ubuntu / MacOS if: ${{ matrix.os != 'windows-latest' }}