Skip to content

Commit ab7effc

Browse files
committed
Move local transport checks to global file
1 parent a0e6a8e commit ab7effc

File tree

3 files changed

+50
-55
lines changed

3 files changed

+50
-55
lines changed

.github/workflows/local_transport.yaml

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/workflows/tests.yaml

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@ jobs:
2929

3030
unit:
3131
needs: rubocop_and_matrix
32-
name: "Ruby ${{ matrix.ruby }} ${{ matrix.os }}"
32+
name: "Unit tests ${{ matrix.ruby }} ${{ matrix.os }}"
3333
strategy:
3434
fail-fast: false
3535
matrix:
3636
os: [ubuntu-24.04, windows-2025]
37-
# don't generate the matrix dynamically until we switch from puppet to openvox, puppet fails on Ruby 3.4
38-
#ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
39-
ruby: ['3.2', '3.3']
37+
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
4038
runs-on: ${{ matrix.os }}
4139
steps:
4240
- name: Checkout repository
@@ -77,11 +75,56 @@ jobs:
7775
uses: dita-ot/[email protected]
7876
with:
7977
build: dita -i documentation/bolt.ditamap -o out -f html5 --processing-mode=strict
78+
79+
local_transports:
80+
name: "local transport ${{ matrix.ruby }} ${{ matrix.os }}"
81+
needs: rubocop_and_matrix
82+
env:
83+
BOLT_WINRM_USER: roddypiper
84+
BOLT_WINRM_HOST: localhost
85+
BOLT_WINRM_PORT: 5985
86+
BOLT_WINRM_SSL_PORT: 5986
87+
BOLT_WINRM_SMB_PORT: 445
88+
strategy:
89+
fail-fast: false
90+
matrix:
91+
os: [ubuntu-24.04, windows-2025]
92+
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
93+
runs-on: ${{ matrix.os }}
94+
steps:
95+
- name: Checkout repository
96+
uses: actions/checkout@v4
97+
- name: Setup Ruby
98+
uses: ruby/setup-ruby@v1
99+
with:
100+
ruby-version: ${{ matrix.ruby }}
101+
bundler-cache: true
102+
- name: Cache modules
103+
id: modules
104+
uses: actions/cache@v4
105+
with:
106+
path: modules
107+
key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
108+
- name: Install modules
109+
if: steps.modules.outputs.cache-hit != 'true'
110+
run: bundle exec r10k puppetfile install
111+
- if: matrix.os == 'ubuntu-24.04'
112+
uses: ./.github/actions/sudo_setup
113+
- if: matrix.os == 'windows-2025'
114+
uses: ./.github/actions/windows_agent_setup
115+
- if: matrix.os == 'ubuntu-24.04'
116+
name: Run tests
117+
run: bundle exec rake ci:local_transport:linux
118+
- if: matrix.os == 'windows-2025'
119+
name: Run tests
120+
run: bundle exec rake ci:local_transport:windows
121+
80122
tests:
81123
needs:
82124
- rubocop_and_matrix
83125
- unit
84126
- run-dita
127+
- local_transports
85128
runs-on: ubuntu-24.04
86129
name: Test suite
87130
steps:

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@ local_gemfile = File.join(__dir__, 'Gemfile.local')
3232
if File.exist? local_gemfile
3333
eval_gemfile local_gemfile
3434
end
35+
36+
# https://github.com/OpenVoxProject/puppet/issues/90
37+
gem 'syslog', '~> 0.3' if RUBY_VERSION >= '3.4'

0 commit comments

Comments
 (0)