Fix broken pip cache dir commands during Github Actions builds.

bartfeenstra · Dec 28, 2023 · e3ce02c · e3ce02c
1 parent b023145
commit e3ce02c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/pull-request-create-release.yml b/.github/workflows/pull-request-create-release.yml
@@ -38,12 +38,15 @@ jobs:
           - name: Linux
             os: ubuntu-20.04
             dist_name: betty-linux
+            python: '3.12'
           - name: macOS
             os: macos-11
             dist_name: betty-macos
+            python: '3.12'
           - name: Windows
             os: windows-2019
             dist_name: betty-windows
+            python: '3.12'
     steps:
       - name: Check out the source code
         uses: actions/checkout@v4

diff --git a/.github/workflows/release-build-pyinstaller.yml b/.github/workflows/release-build-pyinstaller.yml
@@ -14,12 +14,15 @@ jobs:
           - name: Linux
             os: ubuntu-20.04
             dist_name: betty-linux
+            python: '3.12'
           - name: macOS
             os: macos-11
             dist_name: betty-macos
+            python: '3.12'
           - name: Windows
             os: windows-2019
             dist_name: betty-windows
+            python: '3.12'
     steps:
       - name: Check out the source code
         uses: actions/checkout@v4
@@ -32,9 +35,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.pip_cache_dir }}
-          key: pip-${{ runner.os }}-${{ hashFiles('./setup.py') }}
+          key: pip-${{ runner.os }}-${{ matrix.python }}-${{ hashFiles('./setup.py') }}
           restore-keys: |
-            pip-${{ runner.os }}-
+            pip-${{ runner.os }}-${{ matrix.python }}-
 
       - name: Get the npm cache directory
         run: echo "npm_cache_dir=$(npm config get cache)" >> $GITHUB_ENV

diff --git a/.github/workflows/release-build-setuptools.yml b/.github/workflows/release-build-setuptools.yml
@@ -8,6 +8,12 @@ on:
 jobs:
   setuptools:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - name: 'Python 3.12'
+            os: ubuntu-latest
+            python: '3.12'
     steps:
       - name: Check out the source code
         uses: actions/checkout@v4
@@ -20,9 +26,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ env.pip_cache_dir }}
-          key: pip-${{ runner.os }}-${{ hashFiles('./setup.py') }}
+          key: pip-${{ runner.os }}-${{ matrix.python }}-${{ hashFiles('./setup.py') }}
           restore-keys: |
-            pip-${{ runner.os }}-
+            pip-${{ runner.os }}-${{ matrix.python }}-
 
       - name: Get the npm cache directory
         run: echo "npm_cache_dir=$(npm config get cache)" >> $GITHUB_ENV