Skip to content

Commit

Permalink
Remove deprecated images from CI and release-script
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
AyanSinhaMahapatra committed Sep 9, 2022
1 parent f056c59 commit 701ba8e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/scancode-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ jobs:
matrix:
os: [ubuntu-22.04, macos-12]
pyver: ["3.9", "3.10"]
# os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, macos-10.15, macos-11, macos-12]
# os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12]
# pyver: ["3.7", "3.8", "3.9", "3.10"]

steps:
Expand Down Expand Up @@ -324,7 +324,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
os: [ubuntu-20.04, ubuntu-22.04]
pyver: [3.8]

steps:
Expand Down Expand Up @@ -362,7 +362,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [macos-10.15, macos-11, macos-12]
os: [macos-11, macos-12]
pyver: [3.8]

steps:
Expand Down
20 changes: 10 additions & 10 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ jobs:
- template: etc/ci/azure-posix.yml
parameters:
job_name: ubuntu18_cpython
image_name: ubuntu-18.04
job_name: ubuntu22_cpython
image_name: ubuntu-22.04
python_versions: ['3.7', '3.8', '3.9', '3.10']
python_architecture: x64
test_suites:
Expand All @@ -98,17 +98,17 @@ jobs:

- template: etc/ci/azure-posix.yml
parameters:
job_name: macos1015_cpython_1
image_name: macos-10.15
job_name: macos12_cpython_1
image_name: macos-12
python_versions: ['3.7', '3.8']
python_architecture: x64
test_suites:
all: venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py

- template: etc/ci/azure-posix.yml
parameters:
job_name: macos1015_cpython_2
image_name: macos-10.15
job_name: macos12_cpython_2
image_name: macos-12
python_versions: ['3.9', '3.10']
python_architecture: x64
test_suites:
Expand Down Expand Up @@ -197,8 +197,8 @@ jobs:

- template: etc/ci/azure-posix.yml
parameters:
job_name: ubuntu18_cpython_latest_from_pip
image_name: ubuntu-18.04
job_name: ubuntu22_cpython_latest_from_pip
image_name: ubuntu-22.04
python_versions: ['3.7', '3.8', '3.9', '3.10']
test_suites:
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
Expand All @@ -213,8 +213,8 @@ jobs:

- template: etc/ci/azure-posix.yml
parameters:
job_name: macos1015_cpython_latest_from_pip
image_name: macos-10.15
job_name: macos12_cpython_latest_from_pip
image_name: macos-12
python_versions: ['3.7', '3.8', '3.9', '3.10']
test_suites:
all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[dev] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py
Expand Down

0 comments on commit 701ba8e

Please sign in to comment.