From 6b02f07da74da74fc7d358560cb29cce8043064a Mon Sep 17 00:00:00 2001 From: Vladimir Safonkin Date: Tue, 12 Oct 2021 16:10:31 +0300 Subject: [PATCH] Remove Ubuntu 16.04 from images --- .github/workflows/releases-validation.yml | 2 +- azure-pipelines/build-python-packages.yml | 19 ------------------- builders/ubuntu-python-builder.psm1 | 7 ++----- tests/ManifestConfig.Tests.ps1 | 2 -- 4 files changed, 3 insertions(+), 27 deletions(-) diff --git a/.github/workflows/releases-validation.yml b/.github/workflows/releases-validation.yml index 7040985..21ecc98 100644 --- a/.github/workflows/releases-validation.yml +++ b/.github/workflows/releases-validation.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-16.04, ubuntu-18.04, ubuntu-20.04] + os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04] python: [3.5.4, 3.6.7, 3.7.5, 3.8.1] steps: - name: setup-python ${{ matrix.python }} diff --git a/azure-pipelines/build-python-packages.yml b/azure-pipelines/build-python-packages.yml index 0f28e35..b519c99 100644 --- a/azure-pipelines/build-python-packages.yml +++ b/azure-pipelines/build-python-packages.yml @@ -22,25 +22,6 @@ stages: jobs: - template: /azure-pipelines/templates/test-job.yml -- stage: Build_Python_Ubuntu_1604 - dependsOn: [] - variables: - VmImage: 'ubuntu-16.04' - Platform: linux-16.04 - Architecture: x64 - jobs: - - template: /azure-pipelines/templates/build-job.yml - -- stage: Test_Python_Ubuntu_1604 - condition: succeeded() - dependsOn: Build_Python_Ubuntu_1604 - variables: - VmImage: 'ubuntu-16.04' - Platform: linux-16.04 - Architecture: x64 - jobs: - - template: /azure-pipelines/templates/test-job.yml - - stage: Build_Python_Ubuntu_1804 dependsOn: [] variables: diff --git a/builders/ubuntu-python-builder.psm1 b/builders/ubuntu-python-builder.psm1 index 8906148..fe1b42e 100644 --- a/builders/ubuntu-python-builder.psm1 +++ b/builders/ubuntu-python-builder.psm1 @@ -86,10 +86,7 @@ class UbuntuPythonBuilder : NixPythonBuilder { Execute-Command -Command "sudo apt install -y $_" } - if ($this.Platform -ne "linux-16.04") { - ### On Ubuntu-1804, libgdbm-compat-dev has older modules that are no longer in libgdbm-dev - Execute-Command -Command "sudo apt install -y libgdbm-compat-dev" - } - + ### On Ubuntu-1804, libgdbm-compat-dev has older modules that are no longer in libgdbm-dev + Execute-Command -Command "sudo apt install -y libgdbm-compat-dev" } } diff --git a/tests/ManifestConfig.Tests.ps1 b/tests/ManifestConfig.Tests.ps1 index d04d81d..5002418 100644 --- a/tests/ManifestConfig.Tests.ps1 +++ b/tests/ManifestConfig.Tests.ps1 @@ -5,7 +5,6 @@ $Configuration = Read-ConfigurationFile -Filepath $ConfigurationFile $stableTestCases = @( @{ ReleaseName = "python-3.8.3-darwin-x64.tar.gz"; ExpectedResult = @{ platform = "darwin"; platform_version = $null; arch = "x64"} }, - @{ ReleaseName = "python-3.8.3-linux-16.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "16.04"; arch = "x64"} }, @{ ReleaseName = "python-3.8.3-linux-18.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "18.04"; arch = "x64"} }, @{ ReleaseName = "python-3.8.3-linux-20.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "20.04"; arch = "x64"} }, @{ ReleaseName = "python-3.8.3-win32-x64.zip"; ExpectedResult = @{ platform = "win32"; platform_version = $null; arch = "x64"} }, @@ -14,7 +13,6 @@ $stableTestCases = @( $unstableTestCases = @( @{ ReleaseName = "python-3.9.0-alpha.2-darwin-x64.tar.gz"; ExpectedResult = @{ platform = "darwin"; platform_version = $null; arch = "x64"} }, - @{ ReleaseName = "python-3.9.0-beta.1-linux-16.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "16.04"; arch = "x64"} }, @{ ReleaseName = "python-3.9.0-rc.4-linux-18.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "18.04"; arch = "x64"} }, @{ ReleaseName = "python-3.9.0-beta.2-linux-20.04-x64.tar.gz"; ExpectedResult = @{ platform = "linux"; platform_version = "20.04"; arch = "x64"} }, @{ ReleaseName = "python-3.9.0-beta.2-win32-x64.zip"; ExpectedResult = @{ platform = "win32"; platform_version = $null; arch = "x64"} },