Skip to content

Commit f69f185

Browse files
committed
Merge develop into stable for v2024.11.26 release
2 parents 70b1976 + 7a44585 commit f69f185

File tree

7 files changed

+220
-152
lines changed

7 files changed

+220
-152
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,21 @@ jobs:
180180

181181

182182

183+
debian-12:
184+
name: Debian 12
185+
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
186+
uses: ./.github/workflows/test-linux.yml
187+
needs:
188+
- lint
189+
- generate-actions-workflow
190+
with:
191+
distro-slug: debian-12
192+
display-name: Debian 12
193+
container-slug: systemd-debian-12
194+
timeout: 20
195+
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
196+
197+
183198
photon-5:
184199
name: Photon OS 5
185200
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -237,7 +252,7 @@ jobs:
237252
display-name: Ubuntu 22.04
238253
container-slug: systemd-ubuntu-22.04
239254
timeout: 20
240-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
255+
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
241256

242257

243258
set-pipeline-exit-status:
@@ -252,6 +267,7 @@ jobs:
252267
- macos-13
253268
- macos-14
254269
- windows-2022
270+
- debian-12
255271
- photon-5
256272
- rockylinux-8
257273
- rockylinux-9

.github/workflows/templates/generate.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# "ubuntu-2004",
1919
# "ubuntu-2404",
2020
LINUX_DISTROS = [
21+
"debian-12",
2122
"photon-5",
2223
"rockylinux-8",
2324
"rockylinux-9",
@@ -38,15 +39,14 @@
3839
# will add these when they become available with systemd
3940
# "amazonlinux-2",
4041
# "amazonlinux-2023",
41-
# "centos-stream9",
4242
# "debian-11",
43-
# "debian-12",
4443
# "debian-13",
4544
# "fedora-40",
4645
# "photon-4",
4746
# "ubuntu-2004",
4847
# "ubuntu-2404",
4948
STABLE_DISTROS = [
49+
"debian-12",
5050
"photon-5",
5151
"rockylinux-8",
5252
"rockylinux-9",
@@ -58,13 +58,13 @@
5858
# "amazonlinux-2",
5959
# "amazonlinux-2023",
6060
# "debian-11",
61-
# "debian-12",
6261
# "debian-13",
6362
# "fedora-40",
6463
# "photon-4",
6564
# "ubuntu-2004",
6665
# "ubuntu-2404",
6766
ONEDIR_DISTROS = [
67+
"debian-12",
6868
"photon-5",
6969
"rockylinux-8",
7070
"rockylinux-9",
@@ -75,12 +75,12 @@
7575
# will add these when they become available with systemd
7676
# "amazonlinux-2",
7777
# "amazonlinux-2023",
78-
# "debian-12",
7978
# "photon-4",
8079
# "photon-5",
81-
# "rockylinux-9",
80+
# "rockylinux-8",
8281
# "ubuntu-2404",
8382
ONEDIR_RC_DISTROS = [
83+
"debian-12",
8484
"photon-5",
8585
"rockylinux-9",
8686
"ubuntu-2204",
@@ -97,6 +97,7 @@
9797
"photon-5",
9898
]
9999

100+
# "ubuntu-2204",
100101
BLACKLIST_GIT_3006 = [
101102
"amazonlinux-2",
102103
"amazonlinux-2023",
@@ -107,10 +108,10 @@
107108
"photon-5",
108109
"rockylinux-9",
109110
"ubuntu-2004",
110-
"ubuntu-2204",
111111
"ubuntu-2404",
112112
]
113113

114+
# "ubuntu-2204",
114115
BLACKLIST_GIT_3007 = [
115116
"amazonlinux-2",
116117
"amazonlinux-2023",
@@ -122,13 +123,16 @@
122123
"photon-5",
123124
"rockylinux-9",
124125
"ubuntu-2004",
125-
"ubuntu-2204",
126126
"ubuntu-2404",
127127
]
128128

129129
BLACKLIST_GIT_MASTER = [
130130
"amazonlinux-2",
131131
"amazonlinux-2023",
132+
"debian-11",
133+
"debian-12",
134+
"debian-13",
135+
"fedora-40",
132136
"photon-4",
133137
"photon-5",
134138
"rockylinux-9",

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# v2024.11.26
2+
3+
## What's Changed
4+
5+
- Updated URLs in README, and fix deps download issue on RedHat family by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2052
6+
- Update README script help output and scriptversions by @ScriptAutomate in https://github.com/saltstack/salt-bootstrap/pull/2056
7+
8+
**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.21...v2024.11.26
9+
110
# v2024.11.21
211

312
## What's Changed

0 commit comments

Comments
 (0)