Skip to content

Commit 3605726

Browse files
update actions/cache for releases/v4 (#1073)
* update actions/cache * npm audit fix and poetry command update * fix check failures * fix check failures
1 parent b64ffca commit 3605726

20 files changed

+81499
-20590
lines changed

.github/workflows/e2e-cache.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
os: [ubuntu-latest, windows-latest, macos-latest]
23+
os: [ubuntu-latest, windows-latest, macos-13]
2424
python-version: ['3.9', 'pypy-3.7-v7.x']
25+
exclude:
26+
- os: macos-13
27+
python-version: 'pypy-3.7-v7.x'
2528
steps:
2629
- uses: actions/checkout@v4
2730
- name: Setup Python
@@ -88,16 +91,19 @@ jobs:
8891
python-version: ${{ matrix.python-version }}
8992
cache: 'poetry'
9093
- name: Install dependencies
91-
run: poetry install
94+
run: poetry install --no-root
9295

9396
python-pip-dependencies-caching-path:
9497
name: Test pip (Python ${{ matrix.python-version}}, ${{ matrix.os }})
9598
runs-on: ${{ matrix.os }}
9699
strategy:
97100
fail-fast: false
98101
matrix:
99-
os: [ubuntu-latest, windows-latest, macos-latest]
102+
os: [ubuntu-latest, windows-latest, macos-13]
100103
python-version: ['3.9', 'pypy-3.7-v7.x']
104+
exclude:
105+
- os: macos-13
106+
python-version: 'pypy-3.7-v7.x'
101107
steps:
102108
- uses: actions/checkout@v4
103109
- name: Setup Python

.github/workflows/e2e-tests.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ jobs:
2121
- name: Checkout
2222
uses: actions/checkout@v4
2323

24-
- name: Run with setup-python 3.5
25-
uses: ./
26-
with:
27-
python-version: 3.5
28-
- name: Verify 3.5
29-
run: python __tests__/verify-python.py 3.5
30-
3124
- name: Run with setup-python 3.6
3225
uses: ./
3326
with:

.github/workflows/test-pypy.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-latest]
22+
os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-latest]
2323
pypy:
2424
- 'pypy-2.7'
2525
- 'pypy-3.7'
@@ -32,6 +32,9 @@ jobs:
3232
- 'pypy-2.7-v7.3.4rc1'
3333
- 'pypy-3.7-nightly'
3434
- 'pypy3.8-v7.3.7'
35+
exclude:
36+
- os: macos-13
37+
pypy: 'pypy-3.7-nightly'
3538

3639
steps:
3740
- name: Checkout
@@ -73,7 +76,7 @@ jobs:
7376
strategy:
7477
fail-fast: false
7578
matrix:
76-
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-latest]
79+
os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-latest]
7780
pypy: ['pypy2.7', 'pypy3.7', 'pypy3.8', 'pypy3.9-nightly']
7881

7982
steps:
@@ -98,7 +101,7 @@ jobs:
98101
strategy:
99102
fail-fast: false
100103
matrix:
101-
os: [ubuntu-latest, windows-latest, macos-latest]
104+
os: [ubuntu-latest, windows-latest, macos-13]
102105
steps:
103106
- uses: actions/checkout@v4
104107
- name: Setup PyPy and check latest
@@ -131,7 +134,7 @@ jobs:
131134
strategy:
132135
fail-fast: false
133136
matrix:
134-
os: [ubuntu-latest, windows-latest, macos-latest]
137+
os: [ubuntu-latest, windows-latest, macos-13]
135138
steps:
136139
- uses: actions/checkout@v4
137140
- name: Setup PyPy and check latest

.github/workflows/test-python.yml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
24-
python: [3.5.4, 3.6.7, 3.7.5, 3.8.15, 3.9.13]
23+
os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04]
24+
python: [3.6.7, 3.7.5, 3.8.15, 3.9.13]
2525
exclude:
26-
- os: ubuntu-22.04
27-
python: 3.5.4
2826
- os: ubuntu-22.04
2927
python: 3.6.7
3028
- os: ubuntu-22.04
@@ -64,11 +62,9 @@ jobs:
6462
strategy:
6563
fail-fast: false
6664
matrix:
67-
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
68-
python: [3.5.4, 3.6.7, 3.7.5, 3.8.15, 3.9.13]
65+
os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04]
66+
python: [3.6.7, 3.7.5, 3.8.15, 3.9.13]
6967
exclude:
70-
- os: ubuntu-22.04
71-
python: 3.5.4
7268
- os: ubuntu-22.04
7369
python: 3.6.7
7470
- os: ubuntu-22.04
@@ -111,11 +107,9 @@ jobs:
111107
strategy:
112108
fail-fast: false
113109
matrix:
114-
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
115-
python: [3.5.4, 3.6.7, 3.7.5, 3.8.15, 3.9.13]
110+
os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04]
111+
python: [3.6.7, 3.7.5, 3.8.15, 3.9.13]
116112
exclude:
117-
- os: ubuntu-22.04
118-
python: 3.5.4
119113
- os: ubuntu-22.04
120114
python: 3.6.7
121115
- os: ubuntu-22.04
@@ -156,11 +150,9 @@ jobs:
156150
strategy:
157151
fail-fast: false
158152
matrix:
159-
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
160-
python: [3.5.4, 3.6.7, 3.7.5, 3.8.15, 3.9.13, '==3.10.10']
153+
os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04]
154+
python: [3.6.7, 3.7.5, 3.8.15, 3.9.13, '==3.10.10']
161155
exclude:
162-
- os: ubuntu-22.04
163-
python: 3.5.4
164156
- os: ubuntu-22.04
165157
python: 3.6.7
166158
- os: ubuntu-22.04
@@ -206,11 +198,9 @@ jobs:
206198
strategy:
207199
fail-fast: false
208200
matrix:
209-
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
210-
python: [3.5.4, 3.6.7, 3.7.5, 3.8.15, 3.9.13]
201+
os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04]
202+
python: [3.6.7, 3.7.5, 3.8.15, 3.9.13]
211203
exclude:
212-
- os: ubuntu-22.04
213-
python: 3.5.4
214204
- os: ubuntu-22.04
215205
python: 3.6.7
216206
- os: ubuntu-22.04
@@ -256,7 +246,7 @@ jobs:
256246
strategy:
257247
fail-fast: false
258248
matrix:
259-
os: [macos-latest, windows-latest, ubuntu-20.04]
249+
os: [macos-13, windows-latest, ubuntu-20.04]
260250
steps:
261251
- name: Checkout
262252
uses: actions/checkout@v4
@@ -347,7 +337,7 @@ jobs:
347337
strategy:
348338
fail-fast: false
349339
matrix:
350-
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
340+
os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04]
351341
python: ['3.7', '3.8', '3.9', '3.10']
352342
steps:
353343
- name: Checkout
@@ -395,7 +385,7 @@ jobs:
395385
strategy:
396386
fail-fast: false
397387
matrix:
398-
os: [ubuntu-latest, windows-latest, macos-latest]
388+
os: [ubuntu-22.04, windows-latest, macos-13]
399389
steps:
400390
- uses: actions/checkout@v4
401391
- name: Setup Python and check latest

.licenses/npm/@actions/cache.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@actions/core.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@actions/exec.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@actions/http-client-2.2.3.dep.yml

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

.licenses/npm/@fastify/busboy.dep.yml

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

0 commit comments

Comments
 (0)