Skip to content

Commit 6dd8ff7

Browse files
author
IvanZosimov
committed
Change tool cache wording
1 parent 9a40041 commit 6dd8ff7

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
```
3535
The `python-version` input is optional. If not supplied, the Python/PyPy version from the PATH will be used. The default version of Python/PyPy in PATH vary between runners and can be changed unexpectedly so we recommend always use `setup-python`.
3636

37-
The action will first check the local [toolcache](docs/advanced-usage.md#hosted-tool-cache) for a [semver](https://github.com/npm/node-semver#versions) match. If unable to find a specific version in the tool cache, the action will attempt to download a version of Python from [GitHub Releases](https://github.com/actions/python-versions/releases) and for PyPy from the official [PyPy's dist](https://downloads.python.org/pypy/).
37+
The action will first check the local [tool cache](docs/advanced-usage.md#hosted-tool-cache) for a [semver](https://github.com/npm/node-semver#versions) match. If unable to find a specific version in the tool cache, the action will attempt to download a version of Python from [GitHub Releases](https://github.com/actions/python-versions/releases) and for PyPy from the official [PyPy's dist](https://downloads.python.org/pypy/).
3838

3939
For information regarding locally cached versions of Python/PyPy on GitHub hosted runners, check out [GitHub Actions Virtual Environments](https://github.com/actions/virtual-environments).
4040

@@ -81,7 +81,7 @@ See examples of using `cache` and `cache-dependency-path` for `pipenv` and `poet
8181
- [Caching packages data](docs/advanced-usage.md#caching-packages-data)
8282
- [Environment variables and action's outputs](docs/advanced-usage.md#environment-variables-and-actions-outputs)
8383
- [Available versions of Python and PyPy](docs/advanced-usage.md#available-versions-of-python-and-pypy)
84-
- [Hosted Toolcache](docs/advanced-usage.md#hosted-tool-cache)
84+
- [Hosted tool cache](docs/advanced-usage.md#hosted-tool-cache)
8585
- [Using `setup-python` with a self hosted runner](docs/advanced-usage.md#using-setup-python-with-a-self-hosted-runner)
8686
- [Using `setup-python` on GHES](docs/advanced-usage.md#using-setup-python-on-ghes)
8787

docs/advanced-usage.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- [Available versions of Python and PyPy](#available-versions-of-python-and-pypy)
1111
- [Python](#python)
1212
- [PyPy](#pypy)
13-
- [Hosted Tool Cache](#hosted-tool-cache)
13+
- [Hosted tool cache](#hosted-tool-cache)
1414
- [Using `setup-python` with a self hosted runner](#using-setup-python-with-a-self-hosted-runner)
1515
- [Windows](#windows)
1616
- [Linux](#linux)
@@ -354,10 +354,10 @@ Such a requirement on side-effect could be because you don't want your composite
354354

355355
`setup-python` is able to configure **Python** from two sources:
356356

357-
- Preinstalled versions of Python in the toolcache on GitHub-hosted runners.
357+
- Preinstalled versions of Python in the tool cache on GitHub-hosted runners.
358358
- For detailed information regarding the available versions of Python that are installed, see [Supported software](https://docs.github.com/en/actions/reference/specifications-for-github-hosted-runners#supported-software).
359359
- For every minor version of Python, expect only the latest patch to be preinstalled.
360-
- If `3.8.1` is installed for example, and `3.8.2` is released, expect `3.8.1` to be removed and replaced by `3.8.2` in the tools cache.
360+
- If `3.8.1` is installed for example, and `3.8.2` is released, expect `3.8.1` to be removed and replaced by `3.8.2` in the tool cache.
361361
- If the exact patch version doesn't matter to you, specifying just the major and minor version will get you the latest preinstalled patch version. In the previous example, the version spec `3.8` will use the `3.8.2` Python version found in the cache.
362362
- Use `-dev` instead of a patch number (e.g., `3.11-dev`) to install the latest patch version release for a given minor version, *alpha and beta releases included*.
363363
- Downloadable Python versions from GitHub Releases ([actions/python-versions](https://github.com/actions/python-versions/releases)).
@@ -370,7 +370,7 @@ Such a requirement on side-effect could be because you don't want your composite
370370

371371
`setup-python` is able to configure **PyPy** from two sources:
372372

373-
- Preinstalled versions of PyPy in the tools cache on GitHub-hosted runners
373+
- Preinstalled versions of PyPy in the tool cache on GitHub-hosted runners
374374
- For detailed information regarding the available versions of PyPy that are installed, see [Supported software](https://docs.github.com/en/actions/reference/specifications-for-github-hosted-runners#supported-software).
375375
- For the latest PyPy release, all versions of Python are cached.
376376
- Cache is updated with a 1-2 week delay. If you specify the PyPy version as `pypy3.7` or `pypy-3.7`, the cached version will be used although a newer version is available. If you need to start using the recently released version right after release, you should specify the exact PyPy version using `pypy3.7-v7.3.3` or `pypy-3.7-v7.3.3`.
@@ -380,15 +380,15 @@ Such a requirement on side-effect could be because you don't want your composite
380380
- PyPy < 7.3.3 are not available to install on-flight.
381381
- If some versions are not available, you can open an issue in https://foss.heptapod.net/pypy/pypy/
382382

383-
# Hosted Tool Cache
383+
# Hosted tool cache
384384

385-
GitHub hosted runners have a tool cache that comes with a few versions of Python + PyPy already installed. This tool cache helps speed up runs and tool setup by not requiring any new downloads. There is an environment variable called `RUNNER_TOOL_CACHE` on each runner that describes the location of this tools cache and there is where you will find Python and PyPy installed. `setup-python` works by taking a specific version of Python or PyPy in this tools cache and adding it to PATH.
385+
GitHub hosted runners have a tool cache that comes with a few versions of Python + PyPy already installed. This tool cache helps speed up runs and tool setup by not requiring any new downloads. There is an environment variable called `RUNNER_TOOL_CACHE` on each runner that describes the location of this tool cache and there is where you will find Python and PyPy installed. `setup-python` works by taking a specific version of Python or PyPy in this tool cache and adding it to PATH.
386386

387387
|| Location |
388388
|------|-------|
389-
|**Tool Cache Directory** |`RUNNER_TOOL_CACHE`|
390-
|**Python Tool Cache**|`RUNNER_TOOL_CACHE/Python/*`|
391-
|**PyPy Tool Cache**|`RUNNER_TOOL_CACHE/PyPy/*`|
389+
|**Tool cache Directory** |`RUNNER_TOOL_CACHE`|
390+
|**Python tool cache**|`RUNNER_TOOL_CACHE/Python/*`|
391+
|**PyPy tool cache**|`RUNNER_TOOL_CACHE/PyPy/*`|
392392

393393
GitHub virtual environments are set up in [actions/virtual-environments](https://github.com/actions/virtual-environments). During the setup, the available versions of Python and PyPy are automatically downloaded, set up and documented.
394394
- Tool cache setup for Ubuntu: [Install-Toolset.ps1](https://github.com/actions/virtual-environments/blob/main/images/linux/scripts/installers/Install-Toolset.ps1) [Configure-Toolset.ps1](https://github.com/actions/virtual-environments/blob/main/images/linux/scripts/installers/Configure-Toolset.ps1)

0 commit comments

Comments
 (0)