Skip to content

Commit d26d48c

Browse files
authored
Merge pull request OpenVoxProject#125 from bastelfreak/cleanup
CI: Unify workflows & reduce r10k calls
2 parents fca6b4d + 912b833 commit d26d48c

File tree

4 files changed

+96
-120
lines changed

4 files changed

+96
-120
lines changed

.github/workflows/docker_transport.yaml

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

.github/workflows/linux.yaml

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

.github/workflows/ssh_transport.yaml

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

.github/workflows/tests.yaml

Lines changed: 96 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ jobs:
5454
- name: Install modules
5555
if: steps.modules.outputs.cache-hit != 'true'
5656
run: bundle exec r10k puppetfile install
57+
- name: list modules
58+
run: bundle exec puppet module list --modulepath=modules/
5759

5860
cache_modules_windows:
5961
name: 'Windows: Generate module cache'
@@ -74,6 +76,9 @@ jobs:
7476
- name: Install modules
7577
if: steps.modules.outputs.cache-hit != 'true'
7678
run: bundle exec r10k puppetfile install
79+
- name: list modules
80+
run: bundle exec puppet module list --modulepath=modules/
81+
7782
unit:
7883
needs:
7984
- rubocop_and_matrix
@@ -107,7 +112,6 @@ jobs:
107112

108113
run-dita:
109114
runs-on: ubuntu-24.04
110-
111115
steps:
112116
- name: Initialize
113117
uses: actions/checkout@v5
@@ -292,13 +296,14 @@ jobs:
292296
- name: Validate all module dependencies
293297
run: bundle exec ./scripts/check_dependencies.rb
294298

295-
integration:
299+
integration_windows:
296300
needs:
297301
- rubocop_and_matrix
298302
- cache_modules_windows
299303
name: Windows Integration
300304
runs-on: windows-2025
301305
strategy:
306+
fail-fast: false
302307
matrix:
303308
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
304309
env:
@@ -328,6 +333,7 @@ jobs:
328333
name: Windows Agentless
329334
runs-on: windows-2025
330335
strategy:
336+
fail-fast: false
331337
matrix:
332338
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
333339
env:
@@ -350,6 +356,90 @@ jobs:
350356
- name: Run tests
351357
run: bundle exec rake ci:windows:agentless
352358

359+
ssh_transport:
360+
needs:
361+
- rubocop_and_matrix
362+
- cache_modules_linux
363+
name: SSH Transport
364+
runs-on: ubuntu-24.04
365+
strategy:
366+
fail-fast: false
367+
matrix:
368+
ruby: ['3.2', '3.3']
369+
steps:
370+
- name: Checkout repository
371+
uses: actions/checkout@v5
372+
- name: Setup Ruby
373+
uses: ruby/setup-ruby@v1
374+
with:
375+
ruby-version: ${{ matrix.ruby }}
376+
bundler-cache: true
377+
- name: Cache modules
378+
id: modules
379+
uses: actions/cache@v4
380+
with:
381+
path: modules
382+
key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
383+
- uses: ./.github/actions/sudo_setup
384+
- name: Run tests
385+
run: bundle exec rake ci:ssh_transport
386+
387+
docker_transport:
388+
needs:
389+
- rubocop_and_matrix
390+
- cache_modules_linux
391+
name: Docker Transport
392+
runs-on: ubuntu-24.04
393+
strategy:
394+
fail-fast: false
395+
matrix:
396+
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
397+
steps:
398+
- name: Checkout repository
399+
uses: actions/checkout@v5
400+
- name: Setup Ruby
401+
uses: ruby/setup-ruby@v1
402+
with:
403+
ruby-version: ${{ matrix.ruby }}
404+
bundler-cache: true
405+
- name: Cache modules
406+
id: modules
407+
uses: actions/cache@v4
408+
with:
409+
path: modules
410+
key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
411+
- uses: ./.github/actions/sudo_setup
412+
- name: Run tests
413+
run: bundle exec rake ci:docker_transport
414+
415+
integration_linux:
416+
needs:
417+
- rubocop_and_matrix
418+
- cache_modules_linux
419+
name: Linux Integration
420+
runs-on: ubuntu-24.04
421+
strategy:
422+
fail-fast: false
423+
matrix:
424+
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
425+
steps:
426+
- name: Checkout repository
427+
uses: actions/checkout@v5
428+
- name: Setup Ruby
429+
uses: ruby/setup-ruby@v1
430+
with:
431+
ruby-version: ${{ matrix.ruby }}
432+
bundler-cache: true
433+
- name: Cache modules
434+
id: modules
435+
uses: actions/cache@v4
436+
with:
437+
path: modules
438+
key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
439+
- uses: ./.github/actions/sudo_setup
440+
- name: Run tests
441+
run: bundle exec rake ci:linux:integration
442+
353443
tests:
354444
if: always()
355445
needs:
@@ -363,8 +453,11 @@ jobs:
363453
- apply
364454
- boltspec
365455
- check_dependencies
366-
- integration
456+
- integration_windows
367457
- agentless
458+
- ssh_transport
459+
- docker_transport
460+
- integration_linux
368461
runs-on: ubuntu-24.04
369462
name: Test suite
370463
steps:

0 commit comments

Comments
 (0)