8000 Remove ubuntu-18.04 from e2e (#641) · Ditto190/Github-setup-python@d1244c8 · GitHub
[go: up one dir, main page]
Skip to content

Commit d1244c8

Browse files
dmitry-shibanovdmitry-shibanov
authored
Remove ubuntu-18.04 from e2e (actions#641)
1 parent 3091b37 commit d1244c8

File tree

3 files changed

+32
-8
lines changed

3 files changed

+32
-8
lines changed

‎.github/workflows/test-pypy.yml

Lines changed: 2 additions & 2 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-18.04, ubuntu-latest]
22+
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-latest]
2323
pypy:
2424
- 'pypy-2.7'
2525
- 'pypy-3.7'
@@ -73,7 +73,7 @@ jobs:
7373
strategy:
7474
fail-fast: false
7575
matrix:
76-
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-latest]
76+
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-latest]
7777
pypy: ['pypy2.7', 'pypy3.7', 'pypy3.8', 'pypy3.9-nightly']
7878

7979
steps:

‎.github/workflows/test-python.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,17 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
24-
python: [3.5.4, 3.6.7, 3.7.5, 3.8.1]
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]
25+
exclude:
26+
- os: ubuntu-22.04
27+
python: 3.5.4
28+
- os: ubuntu-22.04
29+
python: 3.6.7
30+
- os: ubuntu-22.04
31+
python: 3.7.5
32+
- os: windows-latest
33+
python: 3.8.15
2534
steps:
2635
- name: Checkout
2736
uses: actions/checkout@v3
@@ -55,8 +64,17 @@ jobs:
5564
strategy:
5665
fail-fast: false
5766
matrix:
58-
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
59-
python: [3.5.4, 3.6.7, 3.7.5, 3.8.1]
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]
69+
exclude:
70+
- os: ubuntu-22.04
71+
python: 3.5.4
72+
- os: ubuntu-22.04
73+
python: 3.6.7
74+
- os: ubuntu-22.04
75+
python: 3.7.5
76+
- os: windows-latest
77+
python: 3.8.15
6078
steps:
6179
- name: Checkout
6280
uses: actions/checkout@v3
@@ -93,7 +111,7 @@ jobs:
93111
strategy:
94112
fail-fast: false
95113
matrix:
96-
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
114+
os: [macos-latest, windows-latest, ubuntu-20.04]
97115
steps:
98116
- name: Checkout
99117
uses: actions/checkout@v3
@@ -184,7 +202,7 @@ jobs:
184202
strategy:
185203
fail-fast: false
186204
matrix:
187-
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04]
205+
os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
188206
python: ['3.7', '3.8', '3.9', '3.10']
189207
steps:
190208
- name: Checkout

‎__tests__/cache-restore.test.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,12 @@ virtualenvs.path = "{cache-dir}/virtualenvs" # /Users/patrick/Library/Caches/py
163163
fileHash,
164164
cachePaths
165165
) => {
166+
restoreCacheSpy.mockImplementation(
167+
(cachePaths: string[], primaryKey: string, restoreKey?: string) => {
168+
return primaryKey.includes(fileHash) ? primaryKey : '';
169+
}
170+
);
171+
166172
const cacheDistributor = getCacheDistributor(
167173
packageManager,
168174
pythonVersion,

0 commit comments

Comments
 (0)
0