Skip to content

Commit 3623017

Browse files
authored
Merge pull request #27 from skyamgarp/PA-6764
(PA-6764) Add MacOS 15 ARM to the install-puppet script
2 parents c7968cf + f82f2d2 commit 3623017

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

.github/workflows/install_puppet.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ on:
66
pull_request:
77
branches: [ main ]
88

9-
# Even though checkout@v3 is end-of-life, we cannot upgrade to v4
10-
# because it cannot run on CentOS 7 and Ubuntu 18.04
119
jobs:
1210
install-puppet:
1311
name: ${{ matrix.collection }} / ${{ matrix.os.name }}
@@ -17,19 +15,17 @@ jobs:
1715
matrix:
1816
collection: [ puppet7, puppet8 ]
1917
os: [
20-
{ name: "CentOS 7", image: "litmusimage/centos:7" },
2118
{ name: "Debian 10", image: "litmusimage/debian:10" },
2219
{ name: "Debian 11", image: "litmusimage/debian:11" },
2320
{ name: "Debian 12", image: "litmusimage/debian:12" },
24-
{ name: "Ubuntu 18.04", image: "litmusimage/ubuntu:18.04" },
2521
{ name: "Ubuntu 20.04", image: "litmusimage/ubuntu:20.04" },
2622
{ name: "Ubuntu 22.04", image: "litmusimage/ubuntu:22.04" },
2723
]
2824
container:
2925
image: ${{ matrix.os.image }}
3026
steps:
3127
- name: Checkout current PR
32-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
3329
with:
3430
fetch-depth: 0
3531
- name: Install puppet-agent from ${{ matrix.collection }} collection

install.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ if [ -n "$PT_mac_source" ]; then
364364
mac_source=$PT_mac_source
365365
else
366366
if [ "$nightly" = true ]; then
367-
mac_source='http://nightlies.puppet.com/downloads'
367+
mac_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads'
368368
else
369369
mac_source='http://downloads.puppet.com'
370370
fi
@@ -481,6 +481,7 @@ if true; then
481481
"12") platform_version="12";;
482482
"13") platform_version="13";;
483483
"14") platform_version="14";;
484+
"15") platform_version="15";;
484485
*) echo "No builds for platform: $major_version"
485486
exit 1
486487
;;

0 commit comments

Comments
 (0)