Skip to content

Commit 3a23c8b

Browse files
author
Bill Meek
committed
Merge branch 'pr95'
2 parents 55e389b + ee39542 commit 3a23c8b

2 files changed

Lines changed: 42 additions & 7 deletions

File tree

.github/workflows/ansible.yml

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ name: Run ansible-playbook
33

44
#
55
# This workflow tests that ansible can successfully run
6-
# on linux (macos ansible with macports is extremely
7-
# slow to install and run ansible, and freebsd running
8-
# in a macos vm is extremely fragile, so we defer to
9-
# the full build workflow for macos). As most churn
10-
# in this repo tends to happen in the linux ecosystem
11-
# this provides a quick check for the most common cases.
6+
# on linux and macOS-homebrew (macos ansible with
7+
# macports is extremely slow to install and run ansible,
8+
# and freebsd running in a macos vm is extremely
9+
# fragile, so we defer to the full build workflow for
10+
# macos). As most churn in this repo tends to happen in
11+
# the linux and macOS homebrew ecosystems this provides
12+
# a quick check for the most common cases.
1213
#
1314
# The containers are selected to be from the set of
1415
# linux distributions and versions that are currently
@@ -164,3 +165,36 @@ jobs:
164165
- name: Run ansible to install build requirements
165166
working-directory: ansible
166167
run: ansible-playbook ${{ matrix.container.ansibleopts }} mythtv.yml
168+
169+
ansible-macos:
170+
name: Running ansible-playbook on ${{ matrix.os.desc }}
171+
172+
strategy:
173+
matrix:
174+
os:
175+
- desc: 'macOS 15 (Sequoia) intel'
176+
runner: 'macos-15-intel'
177+
ansibleopts: '--limit localhost'
178+
ansibleoverides: 'ANSIBLE_BECOME=False ANSIBLE_BECOME_ASK_PASS=False'
179+
- desc: 'macOS 26 (Tahoe) arm64'
180+
runner: 'macos-26'
181+
ansibleopts: '--limit localhost'
182+
ansibleoverides: 'ANSIBLE_BECOME=False ANSIBLE_BECOME_ASK_PASS=False'
183+
184+
fail-fast: false
185+
186+
runs-on: ${{ matrix.os.runner }}
187+
188+
steps:
189+
- name: Install Ansible and missing Python necessities
190+
run: |
191+
brew install ansible python-setuptools python-packaging
192+
193+
- name: Checkout repository
194+
uses: actions/checkout@v4
195+
with:
196+
path: ansible
197+
198+
- name: Run ansible to install build requirements
199+
working-directory: ansible
200+
run: ${{ matrix.os.ansibleoverides }} ansible-playbook ${{ matrix.os.ansibleopts }} mythtv.yml

roles/perl/tasks/cpanm_install.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
#
33
# install perl modules with ansible's cpanm capabiltiy
44
#
5+
# Alternative mirrors that occasionally fail:
56
# --mirror 'http://cpan.cpantesters.org/'
7+
# --mirror 'https://metacpan.org/'
68
---
79

810
- name: 'cpanm_install | Install perl modules'
911
become: false
1012
command: cpanm
11-
--mirror 'https://metacpan.org/'
1213
--force
1314
{{ perl_modules | join(' ') }}
1415
ignore_errors: yes

0 commit comments

Comments
 (0)