diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index f90c5acd..ae5ec77b 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -82,6 +82,8 @@ jobs: - name: Install prerequisites run: | pip install --upgrade pip setuptools wheel virtualenv + npm install -g pnpm + pnpm install - name: Set build variables shell: bash @@ -98,12 +100,9 @@ jobs: with: path: | .venv - node_modules - src/web/node_modules - src/typespec-aaz/node_modules - key: ${{ env.CACHE_PREFIX }}-${{ env.WEEK_NUMBER }}-${{ runner.os }}-${{ env.RUNNER_ARCH }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('requirements.txt') }}-${{ env.NODE_VERSION }}-${{ hashFiles('pnpm-lock.yaml') }} + key: ${{ env.CACHE_PREFIX }}-${{ env.WEEK_NUMBER }}-${{ runner.os }}-${{ env.RUNNER_ARCH }}-${{ env.PYTHON_VERSION }}-${{ hashFiles('requirements.txt') }} restore-keys: | - ${{ env.CACHE_PREFIX }}-${{ env.WEEK_NUMBER }}-${{ runner.os }}-${{ env.RUNNER_ARCH }}-${{ env.PYTHON_VERSION }}-${{ env.NODE_VERSION }} + ${{ env.CACHE_PREFIX }}-${{ env.WEEK_NUMBER }}-${{ runner.os }}-${{ env.RUNNER_ARCH }}-${{ env.PYTHON_VERSION }} - name: Setup virtual environment (no cache hit) if: steps.virtualenv-cache.outputs.cache-hit != 'true' @@ -111,8 +110,6 @@ jobs: test -d .venv || virtualenv -p $(which python) --copies --reset-app-data .venv . .venv/bin/activate pip install -e .[dev] - npm install -g pnpm - pnpm install - name: Install editable (cache hit) if: steps.virtualenv-cache.outputs.cache-hit == 'true'