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

[Ubuntu] Remove php installation, tests and software docs for Ubuntu 16 #3541

Merged
merged 4 commits into from
Jun 10, 2021
Merged

[Ubuntu] Remove php installation, tests and software docs for Ubuntu 16 #3541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2229bb
Remove php installation, tests and software docs for Ubuntu 16
Jun 7, 2021
a479441
Merge branch 'main' of github.com:miketimofeev/virtual-environments i…
Jun 10, 2021
7445f14
Add openssl 1.1.1k installation as python toolcache depends on it
Jun 10, 2021
dcec5d8
Add a comment about openssl installation on Ubuntu 16
Jun 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ if (Test-IsUbuntu20) {
$markdown += New-MDNewLine
}

$markdown += Build-PHPSection
if (-not (Test-IsUbuntu16)) {
$markdown += Build-PHPSection
}

$markdown += New-MDHeader "Haskell" -Level 3
$markdown += New-MDList -Style Unordered -Lines (@(
Expand Down
16 changes: 16 additions & 0 deletions images/linux/scripts/installers/basic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
## Desc: Installs basic command line utilities and dev packages
################################################################################
source $HELPER_SCRIPTS/install.sh
source $HELPER_SCRIPTS/os.sh

common_packages=$(get_toolset_value .apt.common_packages[])
cmd_packages=$(get_toolset_value .apt.cmd_packages[])
Expand All @@ -12,4 +13,19 @@ for package in $common_packages $cmd_packages; do
apt-get install -y --no-install-recommends $package
done

# Toolcache Python requires updated libssl-dev, which was previously installed from ppa:ondrej.
# The ppa dropped Ubuntu 16 support hence we need to build OpenSSL from source
if isUbuntu16; then
openSslArchiveName="openssl-1.1.1k.tar.gz"
openSslUrl="https://www.openssl.org/source/${openSslArchiveName}"
download_with_retries $openSslUrl "/tmp"
openSslPath="/tmp/$(basename -s .tar.gz $openSslArchiveName)"
mkdir -p "$openSslPath"
tar -C "$openSslPath" -xzf "/tmp/${openSslArchiveName}" --strip-components=1 && cd $openSslPath
./config --openssldir=/etc/ssl '-Wl,--enable-new-dtags,-rpath,$(LIBRPATH)'
make -s
make install > /dev/null
ln -sf /etc/ssl/bin/openssl /usr/bin/openssl
fi

invoke_tests "Apt"
2 changes: 1 addition & 1 deletion images/linux/scripts/tests/Common.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Describe "PHP" {
Describe "PHP" -Skip:(Test-IsUbuntu16) {

[array]$testCases = (Get-ToolsetContent).php.versions | ForEach-Object { @{phpVersion = $_} }

Expand Down
11 changes: 0 additions & 11 deletions images/linux/toolsets/toolset-1604.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,17 +253,6 @@
"gfortran-9"
]
},
"php": {
"versions": [
"5.6",
"7.0",
"7.1",
"7.2",
"7.3",
"7.4",
"8.0"
]
},
"rubygems": [],
"node_modules": [
{
Expand Down
1 change: 0 additions & 1 deletion images/linux/ubuntu1604.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@
"{{template_dir}}/scripts/installers/bazel.sh",
"{{template_dir}}/scripts/installers/oras-cli.sh",
"{{template_dir}}/scripts/installers/phantomjs.sh",
"{{template_dir}}/scripts/installers/php.sh",
"{{template_dir}}/scripts/installers/postgresql.sh",
"{{template_dir}}/scripts/installers/pulumi.sh",
"{{template_dir}}/scripts/installers/ruby.sh",
Expand Down