Skip to content

Merge foward 3006.x into 3007.x #68897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dwoz wants to merge 52 commits into
base: 3007.x
Choose a base branch
from
Open

Merge foward 3006.x into 3007.x #68897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 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
f0cd678
Merge branch 'origin/3006.x' into 3007.x
dwoz Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -479,8 +479,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -496,8 +496,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -512,10 +512,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10.19"
python-version: "3.10.20"
ci-python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -532,7 +532,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -550,7 +550,7 @@ jobs:
ci-python-version: "3.11"
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
workflow-slug: ci
default-timeout: 180
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -532,8 +532,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -553,8 +553,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -573,10 +573,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10.19"
python-version: "3.10.20"
ci-python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -593,7 +593,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -611,7 +611,7 @@ jobs:
ci-python-version: "3.11"
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
skip-code-coverage: true
workflow-slug: nightly
default-timeout: 360
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/scheduled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,8 +505,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -522,8 +522,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -539,8 +539,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -555,10 +555,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10.19"
python-version: "3.10.20"
ci-python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -575,7 +575,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -593,7 +593,7 @@ jobs:
ci-python-version: "3.11"
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
skip-code-coverage: true
workflow-slug: scheduled
default-timeout: 360
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -507,8 +507,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -529,8 +529,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.10.19"
relenv-version: "0.22.7"
python-version: "3.10.20"
ci-python-version: "3.11"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -549,10 +549,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10.19"
python-version: "3.10.20"
ci-python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -569,7 +569,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -587,7 +587,7 @@ jobs:
ci-python-version: "3.11"
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.19
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.20
skip-code-coverage: true
workflow-slug: staging
default-timeout: 180
Expand Down
Loading