Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
224488c
Move compileall to %posttrans to avoid accidental ppbt toolchain extract
cjriches Mar 4, 2026
ad9e286
Remove stale pycache on upgrade
cjriches Mar 4, 2026
3e51839
Fix Salt package ownership preservation and privilege dropping
dwoz Feb 19, 2026
219d29d
Update test agents with CI package building and testing tools
dwoz Mar 11, 2026
b8c71d2
Fix inotify file descriptor leak during beacon refresh
sujitdb Mar 20, 2026
78c44a7
Migrate Salt packaging metadata to pyproject.toml
dwoz Mar 4, 2026
22471b8
Remove tornado from 3006.x requirements
dwoz Mar 4, 2026
50e2f9e
Include crypto requirements for documentation build
dwoz Mar 4, 2026
8a6d798
Synchronize static crypto requirement files
dwoz Mar 4, 2026
9f0b176
Reformat files with black
dwoz Mar 4, 2026
afaa91e
Fix Windows packaging requirements compilation
dwoz Mar 4, 2026
7c07d7c
Pin markdown-it-py < 3.0.0 for Python 3.9
dwoz Mar 4, 2026
cfa5800
Fix pycryptodome requirement
dwoz Mar 5, 2026
afc7acd
Add a build backend to more easily transition to pyproject.toml
dwoz Mar 6, 2026
f34ba14
Fix windows and mac package builds
dwoz Mar 6, 2026
6f94bd8
Test fixed
dwoz Mar 7, 2026
a74e696
meh
dwoz Mar 9, 2026
1a00da6
Migrate packaging metadata to PEP 621 and fix Linux installation fail…
dwoz Mar 13, 2026
2721a65
Keep contextvars for salt-ssh on older python version
dwoz Mar 13, 2026
5532529
Fix PhotonOS password expiration in CI workflows
dwoz Mar 13, 2026
37e6d09
Merge branch '3006.x' into fix/66449-beacon-inotify-fd-leak
sujitdb Mar 25, 2026
1a8e11d
Fix source package builds failing with hatchling circular build error
sujitdb Mar 27, 2026
e86cf2d
Only re-connect when not closing for good
dwoz Mar 30, 2026
8fa3860
Merge branch '3006.x' into fix/66449-beacon-inotify-fd-leak
sujitdb Mar 30, 2026
e097ae4
Merge pull request #68838 from sujitdb/fix/66449-beacon-inotify-fd-leak
sujitdb Mar 30, 2026
d3a2a6b
Patch tornado for BDSA-2025-60810
twangboy Mar 27, 2026
a2e3616
Patch tornado for BDSA-2026-3867
twangboy Mar 27, 2026
520059a
Upgrade relenv to 0.22.5
dwoz Mar 13, 2026
3e97bd4
Fix windows MSI upgrade test failure
dwoz Mar 17, 2026
5ca689e
Patch our bundled tornado version
dwoz Mar 16, 2026
76ced28
Use version 6.5.5, fix tcp.py
twangboy Mar 31, 2026
46cc3f1
Fix gem test
dwoz Mar 31, 2026
1d4f9dc
Skip gem test on systems with older versions of ruby
twangboy Mar 31, 2026
f0ef962
Fix pre-commit
twangboy Apr 1, 2026
303a4b6
security: patch pip's vendored urllib3 for CVE-2025-66418 and CVE-202…
twangboy Mar 24, 2026
cd9c656
Use a patch file instead of a patched file
twangboy Mar 24, 2026
cc19fff
Make sure pip is using our patched version
twangboy Mar 25, 2026
5c006c6
Fix error handling on no response from http
twangboy Mar 30, 2026
a41baf6
Add a test to verify the files are patched
twangboy Mar 31, 2026
2d0098c
Skip urllib3 patch test on downgrade tests
twangboy Mar 31, 2026
5693d42
Fix pre-commit
twangboy Mar 31, 2026
4069a7f
Upgrade pyopenssl to >= 26.0.0
dwoz Mar 18, 2026
bdff376
Fix x509_v2 states failing with queued state run
lkubb Mar 18, 2026
5ef38e8
Pass through copypath and prepend_cn (x509_v2)
lkubb Mar 18, 2026
98883db
Clear up public key source handling docs
lkubb Mar 18, 2026
6a864e7
Don't add default mode on Windows
lkubb Mar 18, 2026
a3462e9
Add publish_timeout config option defaulting to 15s
dwoz Apr 1, 2026
e98800a
Honor vs honour
dwoz Apr 2, 2026
aa70957
Bump default timeout to 30 and changelog
dwoz Apr 2, 2026
b8987f0
Upgrade relenv to 0.22.6
dwoz Apr 2, 2026
6a4fb98
Bump relenv to 0.22.7
dwoz Apr 3, 2026
5254cf3
Fix intermittent installer hang on Windows
twangboy Apr 1, 2026
7b573b8
Make sure test failures are reported
twangboy Apr 1, 2026
59bb6e2
Fix beacon delete not closing beacon modules
dwoz Apr 5, 2026
9cd7805
Ensure we're not leaking file handles on connect failures
dwoz Feb 13, 2026
2398d69
Fix multimaster connection and event loop regressions
dwoz Apr 4, 2026
94b17fa
Fix event firing to be synchronous in Minion and related classes
dwoz Apr 4, 2026
cc3fc60
Refactor FD leak test to use standard pytest fixtures
dwoz Apr 4, 2026
5b63f33
Correct event firing logic in coroutines and restore io_loop usage
dwoz Apr 4, 2026
ccb56c2
Refine event firing logic for reliability and safety
dwoz Apr 5, 2026
2ebb1fc
Further refine event firing logic to avoid yielding in coroutines whe…
dwoz Apr 5, 2026
bbde288
Correctly await fire_event_async in coroutines within with blocks
dwoz Apr 5, 2026
c851516
Add changelog for filehandle fix
dwoz Apr 5, 2026
8375f95
Update aiohttp to 3.13.5
twangboy Apr 6, 2026
5a1b260
Update requests to address dependabot
twangboy Apr 6, 2026
c4e5d6f
Update cryptography to 46.0.6
twangboy Apr 6, 2026
6da5e22
Update pyasn1 to 0.6.3 (#68824)
twangboy Apr 9, 2026
8830e20
Use powershell for non-localized returns (#68826)
twangboy Apr 9, 2026
5da17f4
Skip system hostnamectl tests when system D-Bus is unavailable (#68918)
sujitdb Apr 10, 2026
dfcbf3e
Bump cryptography to 46.0.7
twangboy Apr 9, 2026
10ae884
Patch vendored tornado for CVE-2026-35536 (set_cookie attribute valid…
twangboy Apr 10, 2026
7b4d10e
Add changelog
twangboy Apr 10, 2026
d95192b
ci: pin GitHub Actions to commit SHAs with version comments
twangboy Apr 10, 2026
6f4e504
Work around photon 5 package index move
dwoz Apr 15, 2026
c8e5709
Fix vault test container name collision and startup failures
dwoz Apr 17, 2026
d9ea947
Improve NSIS/MSI Installers for upgrades (#68962)
twangboy Apr 20, 2026
3e71d84
Comprehensive Photon OS CI stabilization and virtualenv recovery
dwoz Apr 23, 2026
5f2b8dc
Remove unused os_name assignments in unit tests
dwoz Apr 23, 2026
6085524
Fix auditpol backup CSV encoding for localized Windows
twangboy Apr 13, 2026
c13c9d0
Fix test on python 3.10
twangboy Apr 13, 2026
b45f5f0
win_lgpo: read/write advanced audit policy via advapi32, not auditpol…
twangboy Apr 21, 2026
8ed1265
Update changelog
twangboy Apr 21, 2026
9446c37
Fix lint
twangboy Apr 21, 2026
b193f0d
Fix failing test on Windows
twangboy Apr 21, 2026
4193e12
Update ssm-code-signing version to 1.2.1
dwoz Apr 23, 2026
8e01225
Use version not hash
dwoz Apr 23, 2026
e863e70
Release v3006.24
saltbot-open Apr 23, 2026
699e10e
Stabilize package upgrade and downgrade tests on RPM platforms
dwoz Apr 24, 2026
323c73e
Stabilize package CI version checks and downloads
dwoz Apr 25, 2026
98d4538
Fix package CI downgrades and Windows pkg state tests
dwoz Apr 27, 2026
e51820e
Drop orphaned macOS binary-path refresh hook
dwoz Apr 27, 2026
2875fae
Stabilize test_pkg_paths for upgrade and downgrade CI
dwoz Apr 26, 2026
736a25d
Merge branch '3006.x' into merge/3006.x/3007.x-26-04-28
dwoz Apr 29, 2026
8957516
Fix lint
dwoz Apr 29, 2026
547e5fd
Fix lint and unit-test merge fallout
dwoz Apr 29, 2026
718cc1b
Fix pillar refresh completion and flaky CI tests
dwoz Apr 30, 2026
37aaf0e
Fix CI list targeting and macOS pkg binary path refresh
dwoz Apr 30, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .github/actions/build-onedir-salt/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ runs:
cache-prefix: ${{ inputs.cache-prefix }}|relenv|${{ inputs.salt-version }}

- name: Download Source Tarball
uses: actions/download-artifact@v4
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with:
name: salt-${{ inputs.salt-version }}.tar.gz

Expand Down Expand Up @@ -73,7 +73,7 @@ runs:
tools pkg generate-hashes artifacts/${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.*

- name: Upload Onedir Tarball as an Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
path: artifacts/${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz*
Expand All @@ -82,7 +82,7 @@ runs:

- name: Upload Onedir Zipfile as an Artifact
if: ${{ inputs.platform == 'windows' }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.zip
path: artifacts/${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.zip*
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/build-source-tarball/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ runs:

- name: Download Release Patch
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
uses: actions/download-artifact@v4
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with:
name: salt-${{ inputs.salt-version }}.patch

Expand All @@ -46,7 +46,7 @@ runs:
tools pkg generate-hashes dist/salt-${{ inputs.salt-version }}.tar.gz

- name: Upload Source Tarball as an Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: salt-${{ inputs.salt-version }}.tar.gz
path: dist/salt-*.tar.gz*
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ runs:
- name: Cache Provided Path (GitHub Actions)
id: github-cache
if: ${{ env.USE_S3_CACHE != 'true' }}
uses: actions/cache@v4
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
with:
path: ${{ env.GHA_CACHE_PATH }}
key: ${{ env.GHA_CACHE_KEY }}
Expand All @@ -74,7 +74,7 @@ runs:
- name: Configure AWS Credentials to access cache bucket
id: creds
if: ${{ env.USE_S3_CACHE == 'true' }}
uses: aws-actions/configure-aws-credentials@v4
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4
with:
aws-region: ${{ env.GHA_CACHE_AWS_REGION }}

Expand All @@ -84,7 +84,7 @@ runs:
env:
AWS_REGION: ${{ env.GHA_CACHE_AWS_REGION }}
RUNS_ON_S3_BUCKET_CACHE: salt-project-${{ env.SPB_ENVIRONMENT}}-salt-github-actions-s3-cache
uses: runs-on/cache@v4
uses: runs-on/cache@a5f51d6f3fece787d03b7b4e981c82538a0654ed # v4
with:
path: ${{ env.GHA_CACHE_PATH }}
key: ${{ env.GHA_CACHE_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/ssh-tunnel/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ inputs:
runs:
using: composite
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

- uses: actions/setup-python@v5
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
with:
python-version: '3.11'

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/upload-artifact/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ runs:
shopt -s globstar || echo "'globstar' not available"
tar -cavf ${{ inputs.archive-name || inputs.name || 'archive' }}.tar.gz ${{ inputs.path }}

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: ${{ inputs.name }}
path: ${{ inputs.archive-name || inputs.name || 'archive' }}.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
)
steps:
- name: Backport Action
uses: sorenlouv/backport-github-action@v8.9.7
uses: sorenlouv/backport-github-action@e325a2d70df7264afa24c92b1d5feb2278ff63af # v8.9.7
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
auto_backport_label_prefix: "backport:"
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/build-deps-ci-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
include: ${{ fromJSON(inputs.matrix)['linux'] }}
steps:
- name: Setup Python Version ${{ inputs.ci-python-version }}
uses: actions/setup-python@v5
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
with:
python-version: ${{ inputs.ci-python-version }}

Expand All @@ -86,7 +86,7 @@ jobs:
t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"

- name: Checkout Source Code
uses: actions/checkout@v4
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

- name: Cache nox.linux.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
id: nox-dependencies-cache
Expand All @@ -97,7 +97,7 @@ jobs:

- name: Download Onedir Tarball as an Artifact
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
uses: actions/download-artifact@v4
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz
path: artifacts/
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
nox --force-color -e compress-dependencies -- linux ${{ matrix.arch }}

- name: Upload Nox Requirements Tarball
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: nox-linux-${{ matrix.arch }}-${{ inputs.nox-session }}
path: nox.linux.${{ matrix.arch }}.tar.*
Expand All @@ -175,7 +175,7 @@ jobs:
t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"

- name: Checkout Source Code
uses: actions/checkout@v4
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

- name: Cache nox.macos.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
id: nox-dependencies-cache
Expand All @@ -186,7 +186,7 @@ jobs:

- name: Download Onedir Tarball as an Artifact
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
uses: actions/download-artifact@v4
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
path: artifacts/
Expand All @@ -201,7 +201,7 @@ jobs:

- name: Set up Python ${{ inputs.ci-python-version }}
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
uses: actions/setup-python@v5
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
with:
python-version: "${{ inputs.ci-python-version }}"

Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
nox --force-color -e compress-dependencies -- macos ${{ matrix.arch }}

- name: Upload Nox Requirements Tarball
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: nox-macos-${{ matrix.arch }}-${{ inputs.nox-session }}
path: nox.macos.${{ matrix.arch }}.tar.*
Expand Down Expand Up @@ -268,7 +268,7 @@ jobs:
env

- name: Checkout Source Code
uses: actions/checkout@v4
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4

- name: Cache nox.windows.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
id: nox-dependencies-cache
Expand All @@ -279,7 +279,7 @@ jobs:

- name: Download Onedir Tarball as an Artifact
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
uses: actions/download-artifact@v4
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz
path: artifacts/
Expand All @@ -294,7 +294,7 @@ jobs:

- name: Set up Python ${{ inputs.ci-python-version }}
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
uses: actions/setup-python@v5
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
with:
python-version: "${{ inputs.ci-python-version }}"

Expand Down Expand Up @@ -333,7 +333,7 @@ jobs:
nox --force-color -e compress-dependencies -- windows ${{ matrix.arch }}

- name: Upload Nox Requirements Tarball
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: nox-windows-${{ matrix.arch }}-${{ inputs.nox-session }}
path: nox.windows.${{ matrix.arch }}.tar.*
8 changes: 4 additions & 4 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ jobs:
- man

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
with:
python-version: '3.11'

- name: Download Release Patch
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
uses: actions/download-artifact@v4
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with:
name: salt-${{ inputs.salt-version }}.patch

Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:

- name: Upload Built Documentation Artifact(${{ matrix.docs-output }})
if: ${{ steps.build-docs.outputs.has-artifacts == 'true' }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: ${{ steps.build-docs.outputs.artifact-name }}
path: ${{ steps.build-docs.outputs.artifact-path }}
Expand Down
Loading
Loading