Skip to content

Commit f7b990f

Browse files
Merge pull request #25 from step-security/auto-cherry-pick
chore: Cherry-picked changes from upstream
2 parents 6bb90b0 + 5626a12 commit f7b990f

File tree

14 files changed

+965
-254
lines changed

14 files changed

+965
-254
lines changed

.github/workflows/test.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@ jobs:
389389
with:
390390
persist-credentials: false
391391
- name: Install latest version
392+
id: setup-uv
392393
uses: ./
393394
with:
394395
python-version: 3.13.1t
@@ -399,6 +400,14 @@ jobs:
399400
exit 1
400401
fi
401402
shell: bash
403+
- name: Verify output python-version is correct
404+
run: |
405+
if [ "$PYTHON_VERSION" != "3.13.1t" ]; then
406+
exit 1
407+
fi
408+
shell: bash
409+
env:
410+
PYTHON_VERSION: ${{ steps.setup-uv.outputs.python-version }}
402411
- run: uv sync
403412
working-directory: __tests__/fixtures/uv-project
404413

@@ -1189,7 +1198,7 @@ jobs:
11891198
exit 1
11901199
fi
11911200
env:
1192-
CACHE_HIT: ${{ steps.restore.outputs.cache-hit }}
1201+
CACHE_HIT: ${{ steps.restore.outputs.python-cache-hit }}
11931202
- run: uv sync --managed-python
11941203
working-directory: __tests__/fixtures/uv-project
11951204

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ Have a look under [Advanced Configuration](#advanced-configuration) for detailed
125125
- `uvx-path`: The path to the installed uvx binary.
126126
- `cache-hit`: A boolean value to indicate a cache entry was found.
127127
- `venv`: Path to the activated venv if activate-environment is true.
128+
- `python-version`: The Python version that was set.
129+
- `python-cache-hit`: A boolean value to indicate the Python cache entry was found.
128130

129131
### Python version
130132

@@ -309,4 +311,3 @@ as described in the [Caching documentation](docs/caching.md).
309311
## License
310312

311313
MIT
312-

__tests__/fixtures/old-python-constraint-project/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ dependencies = [
99
]
1010

1111
[build-system]
12-
requires = ["hatchling"]
13-
build-backend = "hatchling.build"
12+
requires = ["uv_build>=0.9.22,<0.10.0"]
13+
build-backend = "uv_build"

__tests__/fixtures/old-python-constraint-project/uv.lock

Lines changed: 30 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

action-types.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,7 @@ outputs:
6969
type: string
7070
venv:
7171
type: string
72+
python-version:
73+
type: string
74+
python-cache-hit:
75+
type: boolean

action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ outputs:
9393
description: "The cache key used for storing/restoring the cache"
9494
venv:
9595
description: "Path to the activated venv if activate-environment is true"
96+
python-version:
97+
description: "The Python version that was set."
98+
python-cache-hit:
99+
description: "A boolean value to indicate the Python cache entry was found"
96100
runs:
97101
using: "node24"
98102
main: "dist/setup/index.js"

0 commit comments

Comments
 (0)