Skip to content

Commit 5ada2dd

Browse files
Remove deprecated images from CI and release-script
The following images are deprecated in GitHub actions and Azure DevOps: * `ubuntu-18.04` : actions/runner-images#6002 * `macos-10.15` : actions/runner-images#5583 Due to this there was failing tests due to planned brownouts. Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent f056c59 commit 5ada2dd

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

.github/workflows/scancode-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ jobs:
235235
matrix:
236236
os: [ubuntu-22.04, macos-12]
237237
pyver: ["3.9", "3.10"]
238-
# os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, macos-10.15, macos-11, macos-12]
238+
# os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
239239
# pyver: ["3.7", "3.8", "3.9", "3.10"]
240240

241241
steps:
@@ -324,7 +324,7 @@ jobs:
324324
strategy:
325325
fail-fast: true
326326
matrix:
327-
os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
327+
os: [ubuntu-20.04, ubuntu-22.04]
328328
pyver: [3.8]
329329

330330
steps:
@@ -362,7 +362,7 @@ jobs:
362362
strategy:
363363
fail-fast: true
364364
matrix:
365-
os: [macos-10.15, macos-11, macos-12]
365+
os: [macos-11, macos-12]
366366
pyver: [3.8]
367367

368368
steps:

azure-pipelines.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ jobs:
8080
8181
- template: etc/ci/azure-posix.yml
8282
parameters:
83-
job_name: ubuntu18_cpython
84-
image_name: ubuntu-18.04
83+
job_name: ubuntu22_cpython
84+
image_name: ubuntu-22.04
8585
python_versions: ['3.7', '3.8', '3.9', '3.10']
8686
python_architecture: x64
8787
test_suites:
@@ -98,17 +98,17 @@ jobs:
9898

9999
- template: etc/ci/azure-posix.yml
100100
parameters:
101-
job_name: macos1015_cpython_1
102-
image_name: macos-10.15
101+
job_name: macos12_cpython_1
102+
image_name: macos-12
103103
python_versions: ['3.7', '3.8']
104104
python_architecture: x64
105105
test_suites:
106106
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
107107

108108
- template: etc/ci/azure-posix.yml
109109
parameters:
110-
job_name: macos1015_cpython_2
111-
image_name: macos-10.15
110+
job_name: macos12_cpython_2
111+
image_name: macos-12
112112
python_versions: ['3.9', '3.10']
113113
python_architecture: x64
114114
test_suites:
@@ -197,8 +197,8 @@ jobs:
197197

198198
- template: etc/ci/azure-posix.yml
199199
parameters:
200-
job_name: ubuntu18_cpython_latest_from_pip
201-
image_name: ubuntu-18.04
200+
job_name: ubuntu22_cpython_latest_from_pip
201+
image_name: ubuntu-22.04
202202
python_versions: ['3.7', '3.8', '3.9', '3.10']
203203
test_suites:
204204
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
@@ -211,14 +211,6 @@ jobs:
211211
test_suites:
212212
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
213213

214-
- template: etc/ci/azure-posix.yml
215-
parameters:
216-
job_name: macos1015_cpython_latest_from_pip
217-
image_name: macos-10.15
218-
python_versions: ['3.7', '3.8', '3.9', '3.10']
219-
test_suites:
220-
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
221-
222214
- template: etc/ci/azure-posix.yml
223215
parameters:
224216
job_name: macos11_cpython_latest_from_pip

0 commit comments

Comments
 (0)