Don't share caches between OSes

SmingHub · Jul 2, 2024 · 42a0876 · 42a0876
1 parent ab434e4
commit 42a0876
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git 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
@@ -111,20 +111,13 @@ jobs:
       run: |
         sudo chown $USER /opt
 
-    - name: Cache ESP-IDF
-      if: ${{ matrix.arch == 'Esp32' }}
+    - name: Cache ESP-IDF and build tools
       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' }}