Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Package] Remove packaging, building and installation scripts for Ubuntu 17.10 #7773

Merged
merged 1 commit into from Sep 17, 2018
Merged

[Package] Remove packaging, building and installation scripts for Ubuntu 17.10 #7773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion build.psm1
View file
Open in desktop
Expand Up @@ -133,7 +133,6 @@ function Get-EnvironmentInformation
$environment += @{'IsUbuntu' = $LinuxInfo.ID -match 'ubuntu'}
$environment += @{'IsUbuntu14' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '14.04'}
$environment += @{'IsUbuntu16' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '16.04'}
$environment += @{'IsUbuntu17' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '17.10'}
$environment += @{'IsUbuntu18' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '18.04'}
$environment += @{'IsCentOS' = $LinuxInfo.ID -match 'centos' -and $LinuxInfo.VERSION_ID -match '7'}
$environment += @{'IsFedora' = $LinuxInfo.ID -match 'fedora' -and $LinuxInfo.VERSION_ID -ge 24}
Expand Down
4 changes: 2 additions & 2 deletions tools/installpsh-debian.sh
View file
Open in desktop
Expand Up @@ -139,12 +139,12 @@ curl https://packages.microsoft.com/keys/microsoft.asc | $SUDO apt-key add -
case $DISTRIB_ID in
ubuntu)
case $DISTRIB_RELEASE in
17.10|16.10|16.04|15.10|14.04)
18.04|16.10|16.04|15.10|14.04)
curl https://packages.microsoft.com/config/ubuntu/$DISTRIB_RELEASE/prod.list | $SUDO tee /etc/apt/sources.list.d/microsoft.list
;;
*)
echo "ERROR: unsupported Ubuntu version ($DISTRIB_RELEASE)." >&2
echo "Supported versions: 14.04, 15.10, 16.04, 16.10, 17.10." >&2
echo "Supported versions: 14.04, 15.10, 16.04, 16.10, 18.04." >&2
exit 1
;;
esac
Expand Down
4 changes: 1 addition & 3 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ $Environment = Get-EnvironmentInformation

$packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.psd1"
Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
$DebianDistributions = @("ubuntu.14.04", "ubuntu.16.04", "ubuntu.17.10", "ubuntu.18.04", "debian.8", "debian.9")
$DebianDistributions = @("ubuntu.14.04", "ubuntu.16.04", "ubuntu.18.04", "debian.8", "debian.9")

function Start-PSPackage {
[CmdletBinding(DefaultParameterSetName='Version',SupportsShouldProcess=$true)]
Expand Down Expand Up @@ -667,8 +667,6 @@ function New-UnixPackage {
$DebDistro = "ubuntu.14.04"
} elseif ($Environment.IsUbuntu16) {
$DebDistro = "ubuntu.16.04"
} elseif ($Environment.IsUbuntu17) {
$DebDistro = "ubuntu.17.10"
} elseif ($Environment.IsUbuntu18) {
$DebDistro = "ubuntu.18.04"
} elseif ($Environment.IsDebian8) {
Expand Down