Skip to content

Commit 7a4eb58

Browse files
authored
Merge pull request #655 from shubhamshinde360/PA-5287
(PA-5287) Remove MAC OS 10.15 support
2 parents 40c7ce2 + 5ecab9d commit 7a4eb58

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

spec/classes/puppet_agent_osfamily_darwin_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
let(:params) { { package_version: package_version } }
4343

4444
context 'when running a supported macOS' do
45-
['osx-10.15-x86_64', 'osx-11-x86_64', 'osx-12-x86_64'].each do |tag|
45+
['osx-11-x86_64', 'osx-12-x86_64'].each do |tag|
4646
context "on #{tag} with no aio_version" do
4747
let(:osmajor) { tag.split('-')[1] }
4848

tasks/install_shell.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,17 +227,10 @@ if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then
227227

228228
major_version=`echo $platform_version | cut -d. -f1,2`
229229

230-
# Excepting macOS 10.x, the major version is the first number only
231-
if ! echo "${major_version}" | grep -q '^10\.'; then
232-
major_version=$(echo "${major_version}" | cut -d '.' -f 1);
233-
fi
230+
# The major version is the first number only
231+
major_version=$(echo "${major_version}" | cut -d '.' -f 1);
234232

235233
case $major_version in
236-
"10.11") platform_version="10.11";;
237-
"10.12") platform_version="10.12";;
238-
"10.13") platform_version="10.13";;
239-
"10.14") platform_version="10.14";;
240-
"10.15") platform_version="10.15";;
241234
"11") platform_version="11";;
242235
"12") platform_version="12";;
243236
*) echo "No builds for platform: $major_version"

0 commit comments

Comments
 (0)