Use new 'pip cache dir' to combine macOS/Ubuntu cache config

python-pillow · Jun 30, 2020 · 410095e · 410095e
1 parent 829e1f1
commit 410095e
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,31 +36,25 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Ubuntu cache
-      uses: actions/cache@v2
-      if: startsWith(matrix.os, 'ubuntu')
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
       with:
-        path: ~/.cache/pip
-        key:
-          ${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/.ci/*.sh') }}
-        restore-keys: |
-          ${{ matrix.os }}-${{ matrix.python-version }}-
+        python-version: ${{ matrix.python-version }}
 
-    - name: macOS cache
+    - name: Get pip cache dir
+      id: pip-cache
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+
+    - name: pip cache
       uses: actions/cache@v2
-      if: startsWith(matrix.os, 'macOS')
       with:
-        path: ~/Library/Caches/pip
+        path: ${{ steps.pip-cache.outputs.dir }}
         key:
           ${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/.ci/*.sh') }}
         restore-keys: |
           ${{ matrix.os }}-${{ matrix.python-version }}-
 
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
     - name: Build system information
       run: python .github/workflows/system-info.py