Skip to content

[3006.x] Bump relenv to 0.22.23 #70134

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

Merged
dwoz merged 2 commits into from
Aug 26, 2026
Merged

[3006.x] Bump relenv to 0.22.23 #70134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f046d28
Bump relenv to 0.22.23
dwoz Aug 25, 2026
0be825d
Bump onedir Python point versions to match relenv 0.22.23 assets
dwoz Aug 25, 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 @@ -444,8 +444,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -461,8 +461,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -478,8 +478,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -494,10 +494,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.11.15"
python-version: "3.11.16"
ci-python-version: "3.14"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -514,7 +514,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.14"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -532,7 +532,7 @@ jobs:
ci-python-version: "3.14"
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.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -508,8 +508,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -525,8 +525,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -546,8 +546,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -566,10 +566,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.11.15"
python-version: "3.11.16"
ci-python-version: "3.14"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -586,7 +586,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.14"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -604,7 +604,7 @@ jobs:
ci-python-version: "3.14"
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.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -493,8 +493,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -510,8 +510,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -527,8 +527,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -543,10 +543,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.11.15"
python-version: "3.11.16"
ci-python-version: "3.14"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -563,7 +563,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.14"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -581,7 +581,7 @@ jobs:
ci-python-version: "3.14"
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.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -467,8 +467,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -485,8 +485,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
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.18"
python-version: "3.11.15"
relenv-version: "0.22.23"
python-version: "3.11.16"
ci-python-version: "3.14"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -527,10 +527,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.11.15"
python-version: "3.11.16"
ci-python-version: "3.14"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -547,7 +547,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.14"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
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 @@ -565,7 +565,7 @@ jobs:
ci-python-version: "3.14"
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.11.15
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
skip-code-coverage: true
workflow-slug: staging
default-timeout: 180
Expand Down
3 changes: 3 additions & 0 deletions changelog/70133.fixed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* Relenv 0.22.23
- Fix Verify Builds on Python 3.14 (cffi 2.0.0 for 3.14, swig PyPI shim collision) - #316
- Various native-build platform hardening across releases 0.22.19 - 0.22.23
4 changes: 2 additions & 2 deletions cicd/shared-gh-workflows-context.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
nox_version: "2022.8.7"
python_version: "3.11.15"
relenv_version: "0.22.18"
python_version: "3.11.16"
relenv_version: "0.22.23"
release_branches:
- "3006.x"
- "3007.x"
Expand Down
2 changes: 1 addition & 1 deletion cicd/windows-ssl-104135-patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

The build-deps-ci Windows job extracts the salt onedir, then runs
``nox --install-only -e ci-test-onedir`` and ``nox -e pre-archive-cleanup``.
Both sessions target the onedir's relenv-bundled Python (3.10.20 on 3006.x)
Both sessions target the onedir's relenv-bundled Python (3.10.21 on 3006.x)
and create virtualenvs from it. The ``ci-test-onedir`` session uses
``--system-site-packages``; ``pre-archive-cleanup`` does not. Either way,
both venvs share the onedir's ``Lib/ssl.py`` because virtualenv leaves the
Expand Down
8 changes: 4 additions & 4 deletions tools/ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ def _onedir_build_matrix(os_kind, linux_arm_runner, python_versions=None):
"""
if python_versions is None:
python_versions = [
"3.10.20",
"3.11.15",
"3.12.13",
"3.13.14",
"3.10.21",
"3.11.16",
"3.12.14",
"3.13.15",
]
_matrix = []
if os_kind == "windows":
Expand Down
Loading