Skip to content

Commit d969be8

Browse files
authored
Merge pull request #9 from bastelfreak/oldmac
Reenable acceptance tests for MacOS
2 parents 738fd7c + fdf9044 commit d969be8

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/actions/presuite.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,10 @@ def run(command, dir = './', env = {})
130130

131131
def verify_facter_standalone_exits_0
132132
Dir.chdir(ENV['FACTER_ROOT']) do
133-
run('bundle install --without development')
133+
# `documentation` group contains ronn and hpricot
134+
# both gems are ancient, dead upstream, don't compile on modern rubies
135+
# and are only required for building manpages
136+
run('bundle install --without development:documentation')
134137
run('bundle exec facter')
135138
end
136139
end

.github/workflows/acceptance_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ jobs:
6262
primary_interface=`route -n get default | awk '/interface: */{print $NF}'`
6363
sudo ifconfig $primary_interface inet6 add ::1/64
6464
65-
- name: Run acceptance tests on Linux-like platform
66-
if: runner.os == 'Linux'
65+
- name: Run acceptance tests on Linux and MacOS platform
66+
if: runner.os != 'Windows'
6767
run: sudo -E "PATH=$PATH" ruby $FACTER_ROOT/.github/actions/presuite.rb ${{ matrix.os }}
6868

6969
- name: Run acceptance tests on Windows-like platform

0 commit comments

Comments
 (0)