diff options
| author | Anthony Sottile <asottile@umich.edu> | 2020-12-18 11:01:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 11:01:48 -0800 |
| commit | f14ab08de3d3ed840d111d111bd56122baa4224e (patch) | |
| tree | 9c938b2b669f3a41ae1e0bf4a201e78fad830336 | |
| parent | 403424d60b57e097d32b330fd9360a2dc77d2d78 (diff) | |
| parent | 293a7c962da6aedbccf6ce4fc6fecf345e835432 (diff) | |
| download | pytest-f14ab08de3d3ed840d111d111bd56122baa4224e.tar.gz | |
Merge pull request #8172 from pytest-dev/revert-8171-fix-ci-setup-python
Use new pypy3 github actions syntax
| -rw-r--r-- | .github/workflows/main.yml | 11 | ||||
| -rw-r--r-- | .github/workflows/prepare-release-pr.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/release-on-comment.yml | 3 |
3 files changed, 6 insertions, 11 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ae366a7c..beb501785 100644 --- a/.github/workflows/main.yml +++ b/.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/setup-python@v2.1.4 + 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/setup-python@v2.1.4 + - 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/setup-python@v2.1.4 + uses: actions/setup-python@v2 with: python-version: "3.7" - name: Install dependencies diff --git a/.github/workflows/prepare-release-pr.yml b/.github/workflows/prepare-release-pr.yml index e4bf51d11..dec352364 100644 --- a/.github/workflows/prepare-release-pr.yml +++ b/.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/setup-python@v2.1.4 + uses: actions/setup-python@v2 with: python-version: "3.8" diff --git a/.github/workflows/release-on-comment.yml b/.github/workflows/release-on-comment.yml index f51cd86e9..94863d896 100644 --- a/.github/workflows/release-on-comment.yml +++ b/.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/setup-python@v2.1.4 + uses: actions/setup-python@v2 with: python-version: "3.8" - name: Install dependencies |