Merge pull request #8172 from pytest-dev/revert-8171-fix-ci-setup-python

Use new pypy3 github actions syntax

Author: asottile

.github/workflows/main.yml

@@ -89,7 +89,7 @@ jobs:
             os: ubuntu-latest
             tox_env: "py39-xdist"
           - name: "ubuntu-pypy3"
-            python: "pypy3"
+            python: "pypy-3.7"
             os: ubuntu-latest
             tox_env: "pypy3-xdist"
 
@@ -123,8 +123,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python }}
-      # TODO: Use "v2" tag once https://github.com/actions/setup-python/issues/171 is resolved.
-      uses: actions/[email protected]
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python }}
     - name: Install dependencies
@@ -159,8 +158,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    # TODO: Use "v2" tag once https://github.com/actions/setup-python/issues/171 is resolved.
-    - uses: actions/[email protected]
+    - uses: actions/setup-python@v2
     - name: set PY
       run: echo "name=PY::$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')" >> $GITHUB_ENV
     - uses: actions/cache@v2
@@ -186,8 +184,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      # TODO: Use "v2" tag once https://github.com/actions/setup-python/issues/171 is resolved.
-      uses: actions/[email protected]
+      uses: actions/setup-python@v2
       with:
         python-version: "3.7"
     - name: Install dependencies

.github/workflows/prepare-release-pr.yml

@@ -22,8 +22,7 @@ jobs:
         fetch-depth: 0
 
     - name: Set up Python
-      # TODO: Use "v2" tag once https://github.com/actions/setup-python/issues/171 is resolved.
-      uses: actions/[email protected]
+      uses: actions/setup-python@v2
       with:
         python-version: "3.8"
 

.github/workflows/release-on-comment.yml

@@ -19,8 +19,7 @@ jobs:
         fetch-depth: 0
 
     - name: Set up Python
-      # TODO: Use "v2" tag once https://github.com/actions/setup-python/issues/171 is resolved.
-      uses: actions/[email protected]
+      uses: actions/setup-python@v2
       with:
         python-version: "3.8"
     - name: Install dependencies