Skip to content

Commit dfe4d1f

Browse files
committed
CI: Move windows checks to global config
This ensures that we can depend on the job
1 parent 5387491 commit dfe4d1f

File tree

2 files changed

+60
-77
lines changed

2 files changed

+60
-77
lines changed

.github/workflows/tests.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,64 @@ jobs:
267267
- name: Validate all module dependencies
268268
run: bundle exec ./scripts/check_dependencies.rb
269269

270+
integration:
271+
needs:
272+
- rubocop_and_matrix
273+
- cache_modules
274+
name: Windows Integration
275+
runs-on: windows-2025
276+
strategy:
277+
matrix:
278+
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
279+
env:
280+
WINDOWS_AGENTS: true
281+
steps:
282+
- name: Checkout repository
283+
uses: actions/checkout@v5
284+
- name: Setup Ruby
285+
uses: ruby/setup-ruby@v1
286+
with:
287+
ruby-version: ${{ matrix.ruby }}
288+
bundler-cache: true
289+
- name: Cache modules
290+
id: modules
291+
uses: actions/cache@v4
292+
with:
293+
path: modules
294+
key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
295+
- uses: ./.github/actions/windows_agent_setup
296+
- name: Run tests
297+
run: bundle exec rake ci:windows:integration
298+
299+
agentless:
300+
needs:
301+
- rubocop_and_matrix
302+
- cache_modules
303+
name: Windows Agentless
304+
runs-on: windows-2025
305+
strategy:
306+
matrix:
307+
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
308+
env:
309+
BOLT_WINDOWS: true
310+
steps:
311+
- name: Checkout repository
312+
uses: actions/checkout@v5
313+
- name: Setup Ruby
314+
uses: ruby/setup-ruby@v1
315+
with:
316+
ruby-version: ${{ matrix.ruby }}
317+
bundler-cache: true
318+
- name: Cache modules
319+
id: modules
320+
uses: actions/cache@v4
321+
with:
322+
path: modules
323+
key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
324+
- uses: ./.github/actions/windows_agentless_setup
325+
- name: Run tests
326+
run: bundle exec rake ci:windows:agentless
327+
270328
tests:
271329
if: always()
272330
needs:
@@ -279,6 +337,8 @@ jobs:
279337
- apply
280338
- boltspec
281339
- check_dependencies
340+
- integration
341+
- agentless
282342
runs-on: ubuntu-24.04
283343
name: Test suite
284344
steps:

.github/workflows/windows.yaml

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

0 commit comments

Comments
 (0)