diff --git a/.github/workflows/setup.yaml b/.github/workflows/setup.yaml index 149a7e7..7f0c905 100644 --- a/.github/workflows/setup.yaml +++ b/.github/workflows/setup.yaml @@ -46,12 +46,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }} - cache: 'pip' - cache-dependency-path: | - **/requirements*.txt - **/pyproject.toml - **/poetry.lock - **/Pipfile.lock - name: Install uv uses: astral-sh/setup-uv@v5 @@ -62,6 +56,10 @@ jobs: id: get-uv-cache run: echo "UV_CACHE_DIR=$(uv cache dir)" >> $GITHUB_OUTPUT + - name: Install dependencies + if: ${{ inputs.install-deps != 'none' }} + run: uv sync --extra ${{ inputs.install-deps }} + - name: Cache uv packages uses: actions/cache@v4 with: @@ -69,7 +67,3 @@ jobs: key: ${{ runner.os }}-uv-${{ hashFiles('**/pyproject.toml', '**/requirements*.txt') }} restore-keys: | ${{ runner.os }}-uv- - - - name: Install dependencies - if: ${{ inputs.install-deps != 'none' }} - run: uv sync --extra ${{ inputs.install-deps }} diff --git a/repo_scaffold/templates/template-python/{{cookiecutter.project_slug}}/.github/workflows/setup.yaml b/repo_scaffold/templates/template-python/{{cookiecutter.project_slug}}/.github/workflows/setup.yaml index 138edcf..2757f03 100644 --- a/repo_scaffold/templates/template-python/{{cookiecutter.project_slug}}/.github/workflows/setup.yaml +++ b/repo_scaffold/templates/template-python/{{cookiecutter.project_slug}}/.github/workflows/setup.yaml @@ -47,12 +47,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }} - cache: 'pip' - cache-dependency-path: | - **/requirements*.txt - **/pyproject.toml - **/poetry.lock - **/Pipfile.lock - name: Install uv uses: astral-sh/setup-uv@v5 @@ -63,6 +57,10 @@ jobs: id: get-uv-cache run: echo "UV_CACHE_DIR=$(uv cache dir)" >> $GITHUB_OUTPUT + - name: Install dependencies + if: ${{ inputs.install-deps != 'none' }} + run: uv sync --extra ${{ inputs.install-deps }} + - name: Cache uv packages uses: actions/cache@v4 with: @@ -70,7 +68,3 @@ jobs: key: ${{ runner.os }}-uv-${{ hashFiles('**/pyproject.toml', '**/requirements*.txt') }} restore-keys: | ${{ runner.os }}-uv- - - - name: Install dependencies - if: ${{ inputs.install-deps != 'none' }} - run: uv sync --extra ${{ inputs.install-deps }}