From f1218bd3d9ba97ea13cc7e37a0c5a82ed9fa9556 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 17 Jan 2019 16:30:39 -0800 Subject: [PATCH] Remove Debian 8 references as it is EOL (#8678) Remove Debian 8 references as it is EOL --- README.md | 4 -- build.psm1 | 1 - .../Templates/fxdependent-debian.8/Dockerfile | 40 ------------------- docker/tests/containerTestCommon.psm1 | 4 -- tools/packaging/packaging.psm1 | 5 +-- 5 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 docker/tests/Templates/fxdependent-debian.8/Dockerfile diff --git a/README.md b/README.md index a16dab6c71..f9fd0802a5 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ You can download and install a PowerShell package for any of the following platf | [Ubuntu 18.04][corefx-linux] | [.deb][rl-ubuntu18] | [.deb][pv-ubuntu18] | [Instructions][in-ubuntu18] | | [Ubuntu 16.04][corefx-linux] | [.deb][rl-ubuntu16] | [.deb][pv-ubuntu16] | [Instructions][in-ubuntu16] | | [Ubuntu 14.04][corefx-linux] | [.deb][rl-ubuntu14] | [.deb][pv-ubuntu14] | [Instructions][in-ubuntu14] | -| [Debian 8.7+][corefx-linux] | [.deb][rl-debian8] | [.deb][pv-debian8] | [Instructions][in-deb8] | | [Debian 9][corefx-linux] | [.deb][rl-debian9] | [.deb][pv-debian9] | [Instructions][in-deb9] | | [CentOS 7][corefx-linux] | [.rpm][rl-centos] | [.rpm][pv-centos] | [Instructions][in-centos] | | [Red Hat Enterprise Linux 7][corefx-linux] | [.rpm][rl-centos] | [.rpm][pv-centos] | [Instructions][in-rhel7] | @@ -64,7 +63,6 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu [rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v6.1.2/powershell_6.1.2-1.ubuntu.18.04_amd64.deb [rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.1.2/powershell_6.1.2-1.ubuntu.16.04_amd64.deb [rl-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.1.2/powershell_6.1.2-1.ubuntu.14.04_amd64.deb -[rl-debian8]: https://github.com/PowerShell/PowerShell/releases/download/v6.1.2/powershell_6.1.2-1.debian.8_amd64.deb [rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v6.1.2/powershell_6.1.2-1.debian.9_amd64.deb [rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.1.2/powershell-6.1.2-1.rhel.7.x86_64.rpm [rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v6.1.2/powershell-6.1.2-osx-x64.pkg @@ -82,7 +80,6 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu [pv-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v6.2.0-preview.3/powershell-preview_6.2.0-preview.3-1.ubuntu.18.04_amd64.deb [pv-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v6.2.0-preview.3/powershell-preview_6.2.0-preview.3-1.ubuntu.16.04_amd64.deb [pv-ubuntu14]: https://github.com/PowerShell/PowerShell/releases/download/v6.2.0-preview.3/powershell-preview_6.2.0-preview.3-1.ubuntu.14.04_amd64.deb -[pv-debian8]: https://github.com/PowerShell/PowerShell/releases/download/v6.2.0-preview.3/powershell-preview_6.2.0-preview.3-1.debian.8_amd64.deb [pv-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v6.2.0-preview.3/powershell-preview_6.2.0-preview.3-1.debian.9_amd64.deb [pv-centos]: https://github.com/PowerShell/PowerShell/releases/download/v6.2.0-preview.3/powershell-preview-6.2.0_preview.3-1.rhel.7.x86_64.rpm [pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v6.2.0-preview.3/powershell-6.2.0-preview.3-osx-x64.pkg @@ -99,7 +96,6 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu [in-ubuntu14]: https://docs.microsoft.com/powershell/scripting/setup/installing-powershell-core-on-linux?view=powershell-6#ubuntu-1404 [in-ubuntu16]: https://docs.microsoft.com/powershell/scripting/setup/installing-powershell-core-on-linux?view=powershell-6#ubuntu-1604 [in-ubuntu18]: https://docs.microsoft.com/powershell/scripting/setup/installing-powershell-core-on-linux?view=powershell-6#ubuntu-1804 -[in-deb8]: https://docs.microsoft.com/powershell/scripting/setup/installing-powershell-core-on-linux?view=powershell-6#debian-8 [in-deb9]: https://docs.microsoft.com/powershell/scripting/setup/installing-powershell-core-on-linux?view=powershell-6#debian-9 [in-centos]: https://docs.microsoft.com/powershell/scripting/setup/installing-powershell-core-on-linux?view=powershell-6#centos-7 [in-rhel7]: https://docs.microsoft.com/powershell/scripting/setup/installing-powershell-core-on-linux?view=powershell-6#red-hat-enterprise-linux-rhel-7 diff --git a/build.psm1 b/build.psm1 index 0473073266..568ccf1693 100644 --- a/build.psm1 +++ b/build.psm1 @@ -128,7 +128,6 @@ function Get-EnvironmentInformation $environment += @{'LinuxInfo' = $LinuxInfo} $environment += @{'IsDebian' = $LinuxInfo.ID -match 'debian'} - $environment += @{'IsDebian8' = $Environment.IsDebian -and $LinuxInfo.VERSION_ID -match '8'} $environment += @{'IsDebian9' = $Environment.IsDebian -and $LinuxInfo.VERSION_ID -match '9'} $environment += @{'IsUbuntu' = $LinuxInfo.ID -match 'ubuntu'} $environment += @{'IsUbuntu14' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '14.04'} diff --git a/docker/tests/Templates/fxdependent-debian.8/Dockerfile b/docker/tests/Templates/fxdependent-debian.8/Dockerfile deleted file mode 100644 index ea6ad2dfc0..0000000000 --- a/docker/tests/Templates/fxdependent-debian.8/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM debian:jessie - -ARG PACKAGENAME -ARG PACKAGELOCATION -ARG PREVIEWSUFFIX= -ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module -ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git" - -# Install dependencies -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - apt-utils \ - ca-certificates \ - apt-transport-https \ - locales \ - git \ - wget - -# Install dotnet-runtime -RUN wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg -RUN mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ -ADD https://packages.microsoft.com/config/debian/8/prod.list . -RUN mv prod.list /etc/apt/sources.list.d/microsoft-prod.list -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - dotnet-runtime-2.1 - -# Setup the locale -ENV LANG en_US.UTF-8 -ENV LC_ALL $LANG -RUN locale-gen $LANG && update-locale - -# Install PowerShell package -ADD $PACKAGELOCATION/$PACKAGENAME . -RUN mkdir -p /opt/microsoft/powershell -RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell - -# Download and run tests -RUN $TESTDOWNLOADCOMMAND -RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount" diff --git a/docker/tests/containerTestCommon.psm1 b/docker/tests/containerTestCommon.psm1 index 0704cf493c..76caafce98 100644 --- a/docker/tests/containerTestCommon.psm1 +++ b/docker/tests/containerTestCommon.psm1 @@ -220,7 +220,6 @@ function Get-DefaultPreviewConfigForPackageValidation { # format: = @{ 'centos7'='rhel.7'; - 'debian.8'='debian.8'; 'debian.9'='debian.9'; 'fedora26'='rhel.7'; 'fedora27'='rhel.7'; @@ -231,7 +230,6 @@ function Get-DefaultPreviewConfigForPackageValidation 'ubuntu16.04'='ubuntu.16.04'; 'ubuntu18.04'='ubuntu.18.04'; 'fxdependent-centos7'='linux-x64-fxdependent.tar.gz'; - 'fxdependent-debian.8'='linux-x64-fxdependent.tar.gz'; 'fxdependent-debian.9'='linux-x64-fxdependent.tar.gz'; 'fxdependent-fedora27'='linux-x64-fxdependent.tar.gz'; 'fxdependent-fedora28'='linux-x64-fxdependent.tar.gz'; @@ -251,7 +249,6 @@ function Get-DefaultStableConfigForPackageValidation { # format: = @{ 'centos7'='rhel.7'; - 'debian.8'='debian.8'; 'debian.9'='debian.9'; 'fedora26'='rhel.7'; 'fedora27'='rhel.7'; @@ -260,7 +257,6 @@ function Get-DefaultStableConfigForPackageValidation 'ubuntu14.04'='ubuntu.14.04'; 'ubuntu16.04'='ubuntu.16.04'; 'fxdependent-centos7'='linux-x64-fxdependent.tar.gz'; - 'fxdependent-debian.8'='linux-x64-fxdependent.tar.gz'; 'fxdependent-debian.9'='linux-x64-fxdependent.tar.gz'; 'fxdependent-fedora27'='linux-x64-fxdependent.tar.gz'; 'fxdependent-opensuse42.2'='linux-x64-fxdependent.tar.gz'; diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index dfea021bf7..6c7e7cb0f3 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -6,7 +6,7 @@ $RepoRoot = (Resolve-Path -Path "$PSScriptRoot/../..").Path $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.psd1" Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force -$DebianDistributions = @("ubuntu.14.04", "ubuntu.16.04", "ubuntu.18.04", "debian.8", "debian.9") +$DebianDistributions = @("ubuntu.14.04", "ubuntu.16.04", "ubuntu.18.04", "debian.9") function Start-PSPackage { [CmdletBinding(DefaultParameterSetName='Version',SupportsShouldProcess=$true)] @@ -691,8 +691,6 @@ function New-UnixPackage { $DebDistro = "ubuntu.16.04" } elseif ($Environment.IsUbuntu18) { $DebDistro = "ubuntu.18.04" - } elseif ($Environment.IsDebian8) { - $DebDistro = "debian.8" } elseif ($Environment.IsDebian9) { $DebDistro = "debian.9" } else { @@ -1127,7 +1125,6 @@ function Get-PackageDependencies "ubuntu.16.04" { $Dependencies += @("libssl1.0.0", "libicu55") } "ubuntu.17.10" { $Dependencies += @("libssl1.0.0", "libicu57") } "ubuntu.18.04" { $Dependencies += @("libssl1.0.0", "libicu60") } - "debian.8" { $Dependencies += @("libssl1.0.0", "libicu52") } "debian.9" { $Dependencies += @("libssl1.0.2", "libicu57") } default { throw "Debian distro '$Distribution' is not supported." } }