Skip to content

Commit 11a924b

Browse files
committed
Merge develop into stable for v2024.11.07 release
2 parents 1c54e2f + bf7943e commit 11a924b

23 files changed

+982
-1568
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
separator: ","
2828
files: |
2929
bootstrap-salt.*
30-
Gemfile
31-
kitchen*.yml
3230
tests/**
3331
.github/workflows/**
3432
files_ignore: |
@@ -147,21 +145,6 @@ jobs:
147145

148146

149147

150-
windows-2019:
151-
name: Windows 2019
152-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
153-
uses: ./.github/workflows/test-windows.yml
154-
needs:
155-
- lint
156-
- generate-actions-workflow
157-
with:
158-
distro-slug: windows-2019
159-
display-name: Windows 2019
160-
timeout: 20
161-
runs-on: windows-2019
162-
instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
163-
164-
165148
windows-2022:
166149
name: Windows 2022
167150
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -220,20 +203,6 @@ jobs:
220203
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
221204

222205

223-
arch:
224-
name: Arch
225-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
226-
uses: ./.github/workflows/test-linux.yml
227-
needs:
228-
- lint
229-
- generate-actions-workflow
230-
with:
231-
distro-slug: arch
232-
display-name: Arch
233-
timeout: 20
234-
instances: '["git-master", "latest", "default"]'
235-
236-
237206
centos-stream9:
238207
name: CentOS Stream 9
239208
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -304,34 +273,6 @@ jobs:
304273
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
305274

306275

307-
gentoo:
308-
name: Gentoo
309-
if: github.event_name == 'push'
310-
uses: ./.github/workflows/test-linux.yml
311-
needs:
312-
- lint
313-
- generate-actions-workflow
314-
with:
315-
distro-slug: gentoo
316-
display-name: Gentoo
317-
timeout: 90
318-
instances: '["git-master"]'
319-
320-
321-
gentoo-systemd:
322-
name: Gentoo (systemd)
323-
if: github.event_name == 'push'
324-
uses: ./.github/workflows/test-linux.yml
325-
needs:
326-
- lint
327-
- generate-actions-workflow
328-
with:
329-
distro-slug: gentoo-systemd
330-
display-name: Gentoo (systemd)
331-
timeout: 90
332-
instances: '["git-master"]'
333-
334-
335276
opensuse-15:
336277
name: Opensuse 15
337278
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -482,19 +423,15 @@ jobs:
482423
- generate-actions-workflow
483424
- macos-12
484425
- macos-13
485-
- windows-2019
486426
- windows-2022
487427
- almalinux-8
488428
- almalinux-9
489429
- amazon-2
490-
- arch
491430
- centos-stream9
492431
- debian-11
493432
- debian-12
494433
- fedora-39
495434
- fedora-40
496-
- gentoo
497-
- gentoo-systemd
498435
- opensuse-15
499436
- oraclelinux-8
500437
- oraclelinux-9

0 commit comments

Comments
 (0)