ci: simplify venv cache key and consolidate poetry env

bdraco · bdraco · commit 80252abe0932 · 2026-05-17T13:21:59.000-07:00
Three trims:

1. Drop ${{ env.ImageOS }}-${{ env.ImageVersion }}- from both
   cache keys. env context only resolves workflow-declared env
   vars, not runner process env vars like ImageOS / ImageVersion,
   so these interpolations were silently empty (visible in
   dbus-fast's post-merge logs of the same pattern).
2. Merge the two hashFiles() calls into one covering poetry.lock,
   pyproject.toml, build_ext.py, src/zeroconf/**/*.py, and
   src/zeroconf/**/*.pxd. Concatenated either way; one call is
   easier to read.
3. Promote POETRY_VIRTUALENVS_IN_PROJECT to workflow-level env:
   instead of duplicating on the test and benchmark jobs.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,6 +11,9 @@ concurrency:
   group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+env:
+  POETRY_VIRTUALENVS_IN_PROJECT: "true"
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -75,8 +78,6 @@ jobs:
           - os: macos-latest
             python-version: "pypy-3.10"
     runs-on: ${{ matrix.os }}
-    env:
-      POETRY_VIRTUALENVS_IN_PROJECT: "true"
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
       - name: Set up uv
@@ -98,7 +99,7 @@ jobs:
           path: |
             .venv
             src/zeroconf/**/*.so
-          key: venv-v1-${{ runner.os }}-${{ env.ImageOS }}-${{ env.ImageVersion }}-py${{ matrix.python-version }}-${{ matrix.extension }}-${{ hashFiles('poetry.lock', 'pyproject.toml', 'build_ext.py') }}-${{ hashFiles('src/zeroconf/**/*.py', 'src/zeroconf/**/*.pxd') }}
+          key: venv-v1-${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.extension }}-${{ hashFiles('poetry.lock', 'pyproject.toml', 'build_ext.py', 'src/zeroconf/**/*.py', 'src/zeroconf/**/*.pxd') }}
       - name: Install Dependencies no cython
         if: ${{ matrix.extension == 'skip_cython' && steps.cache-venv.outputs.cache-hit != 'true' }}
         env:
@@ -118,8 +119,6 @@ jobs:
 
   benchmark:
     runs-on: ubuntu-latest
-    env:
-      POETRY_VIRTUALENVS_IN_PROJECT: "true"
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
       - name: Setup Python 3.13
@@ -139,7 +138,7 @@ jobs:
           path: |
             .venv
             src/zeroconf/**/*.so
-          key: venv-v1-${{ runner.os }}-${{ env.ImageOS }}-${{ env.ImageVersion }}-benchmark-py3.13-${{ hashFiles('poetry.lock', 'pyproject.toml', 'build_ext.py') }}-${{ hashFiles('src/zeroconf/**/*.py', 'src/zeroconf/**/*.pxd') }}
+          key: venv-v1-${{ runner.os }}-benchmark-py3.13-${{ hashFiles('poetry.lock', 'pyproject.toml', 'build_ext.py', 'src/zeroconf/**/*.py', 'src/zeroconf/**/*.pxd') }}
       - name: Install Dependencies
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
