Skip to content

Commit

Permalink
Merge develop into stable for v2024.11.26 release
Browse files Browse the repository at this point in the history
  • Loading branch information
saltbot-open committed Nov 26, 2024
2 parents 70b1976 + 7a44585 commit f69f185
Show file tree
Hide file tree
Showing 7 changed files with 220 additions and 152 deletions.
18 changes: 17 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,21 @@ jobs:



debian-12:
name: Debian 12
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
uses: ./.github/workflows/test-linux.yml
needs:
- lint
- generate-actions-workflow
with:
distro-slug: debian-12
display-name: Debian 12
container-slug: systemd-debian-12
timeout: 20
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'


photon-5:
name: Photon OS 5
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
Expand Down Expand Up @@ -237,7 +252,7 @@ jobs:
display-name: Ubuntu 22.04
container-slug: systemd-ubuntu-22.04
timeout: 20
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'


set-pipeline-exit-status:
Expand All @@ -252,6 +267,7 @@ jobs:
- macos-13
- macos-14
- windows-2022
- debian-12
- photon-5
- rockylinux-8
- rockylinux-9
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/templates/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
# "ubuntu-2004",
# "ubuntu-2404",
LINUX_DISTROS = [
"debian-12",
"photon-5",
"rockylinux-8",
"rockylinux-9",
Expand All @@ -38,15 +39,14 @@
# will add these when they become available with systemd
# "amazonlinux-2",
# "amazonlinux-2023",
# "centos-stream9",
# "debian-11",
# "debian-12",
# "debian-13",
# "fedora-40",
# "photon-4",
# "ubuntu-2004",
# "ubuntu-2404",
STABLE_DISTROS = [
"debian-12",
"photon-5",
"rockylinux-8",
"rockylinux-9",
Expand All @@ -58,13 +58,13 @@
# "amazonlinux-2",
# "amazonlinux-2023",
# "debian-11",
# "debian-12",
# "debian-13",
# "fedora-40",
# "photon-4",
# "ubuntu-2004",
# "ubuntu-2404",
ONEDIR_DISTROS = [
"debian-12",
"photon-5",
"rockylinux-8",
"rockylinux-9",
Expand All @@ -75,12 +75,12 @@
# will add these when they become available with systemd
# "amazonlinux-2",
# "amazonlinux-2023",
# "debian-12",
# "photon-4",
# "photon-5",
# "rockylinux-9",
# "rockylinux-8",
# "ubuntu-2404",
ONEDIR_RC_DISTROS = [
"debian-12",
"photon-5",
"rockylinux-9",
"ubuntu-2204",
Expand All @@ -97,6 +97,7 @@
"photon-5",
]

# "ubuntu-2204",
BLACKLIST_GIT_3006 = [
"amazonlinux-2",
"amazonlinux-2023",
Expand All @@ -107,10 +108,10 @@
"photon-5",
"rockylinux-9",
"ubuntu-2004",
"ubuntu-2204",
"ubuntu-2404",
]

# "ubuntu-2204",
BLACKLIST_GIT_3007 = [
"amazonlinux-2",
"amazonlinux-2023",
Expand All @@ -122,13 +123,16 @@
"photon-5",
"rockylinux-9",
"ubuntu-2004",
"ubuntu-2204",
"ubuntu-2404",
]

BLACKLIST_GIT_MASTER = [
"amazonlinux-2",
"amazonlinux-2023",
"debian-11",
"debian-12",
"debian-13",
"fedora-40",
"photon-4",
"photon-5",
"rockylinux-9",
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# v2024.11.26

## What's Changed

- Updated URLs in README, and fix deps download issue on RedHat family by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2052
- Update README script help output and scriptversions by @ScriptAutomate in https://github.com/saltstack/salt-bootstrap/pull/2056

**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.11.21...v2024.11.26

# v2024.11.21

## What's Changed
Expand Down
Loading

0 comments on commit f69f185

Please sign in to comment.