8000 Merge branch 'master' into patch-1 · bcomnes/setup-python@47b0b94 · GitHub
[go: up one dir, main page]

Skip to content

Commit 47b0b94

Browse files
authored
Merge branch 'master' into patch-1
2 parents 31d200e + 1396627 commit 47b0b94

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<a href="https://github.com/actions/setup-python"><img alt="GitHub Actions status" src="https://github.com/actions/setup-python/workflows/Main%20workflow/badge.svg"></a>
55
</p>
66

7-
This action sets up a python environment for use in actions by:
7+
This action sets up a Python environment for use in actions by:
88

9-
- optionally installing a version of python and adding to PATH. Note that this action only uses versions of Python already installed in the cache. The action will fail if no matching versions are found.
9+
- optionally installing a version of Python and adding to PATH. Note that this action only uses versions of Python already installed in the cache. The action will fail if no matching versions are found.
1010
- registering problem matchers for error output
1111

1212
# Usage
@@ -31,14 +31,14 @@ jobs:
3131
runs-on: ubuntu-16.04
3232
strategy:
3333
matrix:
34-
python: [ '2.x', '3.x', 'pypy2', 'pypy3' ]
35-
name: Python ${{ matrix.python }} sample
34+
python-version: [ '2.x', '3.x', 'pypy2', 'pypy3' ]
35+
name: Python ${{ matrix.python-version }} sample
3636
steps:
3737
- uses: actions/checkout@master
3838
- name: Setup python
3939
uses: actions/setup-python@v1
4040
with:
41-
python-version: ${{ matrix.python }}
41+
python-version: ${{ matrix.python-version }}
4242
architecture: x64
4343
- run: python my_script.py
4444
```

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"repository": {
1414
"type": "git",
15-
"url": "git+https://github.com/actions/ssetup-python.git"
15+
"url": "git+https://github.com/actions/setup-python.git"
1616
},
1717
"keywords": [
1818
"actions",

0 commit comments

Comments
 (0)
0