Skip to content

Commit 6072117

Browse files
committed
Bump onedir Python point versions to match relenv 0.22.23 assets
relenv 0.22.23 ships prebuilt Python tarballs for 3.10.21, 3.11.16, 3.12.14, 3.13.15, 3.14.7 (bumped from the 0.22.18 set of 3.10.20, 3.11.15, 3.12.13, 3.13.14). Without also bumping salt's own point- version pins, 'python -m relenv fetch' 404s on every host looking for 3.10.20-arm64-macos.tar.xz (etc.), and the Build Salt Onedir jobs all fail. - Update python_version in cicd/shared-gh-workflows-context.yml. - Update the point-version list in tools/ci._onedir_build_matrix. - Update the docstring in cicd/windows-ssl-104135-patch.py. - Regenerate ci.yml, nightly.yml, scheduled.yml, staging.yml via the generate-workflows pre-commit hook.
1 parent 1fde51d commit 6072117

7 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ jobs:
445445
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
446446
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
447447
relenv-version: "0.22.23"
448-
python-version: "3.11.15"
448+
python-version: "3.11.16"
449449
ci-python-version: "3.14"
450450
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
451451
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -462,7 +462,7 @@ jobs:
462462
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
463463
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
464464
relenv-version: "0.22.23"
465-
python-version: "3.11.15"
465+
python-version: "3.11.16"
466466
ci-python-version: "3.14"
467467
source: "onedir"
468468
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -479,7 +479,7 @@ jobs:
479479
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
480480
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
481481
relenv-version: "0.22.23"
482-
python-version: "3.11.15"
482+
python-version: "3.11.16"
483483
ci-python-version: "3.14"
484484
source: "src"
485485
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -494,10 +494,10 @@ jobs:
494494
with:
495495
nox-session: ci-test-onedir
496496
nox-version: 2022.8.7
497-
python-version: "3.11.15"
497+
python-version: "3.11.16"
498498
ci-python-version: "3.14"
499499
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
500-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
500+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
501501
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
502502
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
503503
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -514,7 +514,7 @@ jobs:
514514
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
515515
nox-version: 2022.8.7
516516
ci-python-version: "3.14"
517-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
517+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
518518
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
519519
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
520520
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -532,7 +532,7 @@ jobs:
532532
ci-python-version: "3.14"
533533
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
534534
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
535-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
535+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
536536
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
537537
workflow-slug: ci
538538
default-timeout: 180

‎.github/workflows/nightly.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ jobs:
509509
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
510510
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
511511
relenv-version: "0.22.23"
512-
python-version: "3.11.15"
512+
python-version: "3.11.16"
513513
ci-python-version: "3.14"
514514
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
515515
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -526,7 +526,7 @@ jobs:
526526
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
527527
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
528528
relenv-version: "0.22.23"
529-
python-version: "3.11.15"
529+
python-version: "3.11.16"
530530
ci-python-version: "3.14"
531531
source: "onedir"
532532
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -547,7 +547,7 @@ jobs:
547547
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
548548
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
549549
relenv-version: "0.22.23"
550-
python-version: "3.11.15"
550+
python-version: "3.11.16"
551551
ci-python-version: "3.14"
552552
source: "src"
553553
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -566,10 +566,10 @@ jobs:
566566
with:
567567
nox-session: ci-test-onedir
568568
nox-version: 2022.8.7
569-
python-version: "3.11.15"
569+
python-version: "3.11.16"
570570
ci-python-version: "3.14"
571571
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
572-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
572+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
573573
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
574574
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
575575
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -586,7 +586,7 @@ jobs:
586586
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
587587
nox-version: 2022.8.7
588588
ci-python-version: "3.14"
589-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
589+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
590590
skip-code-coverage: true
591591
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
592592
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -604,7 +604,7 @@ jobs:
604604
ci-python-version: "3.14"
605605
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
606606
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
607-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
607+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
608608
skip-code-coverage: true
609609
workflow-slug: nightly
610610
default-timeout: 360

‎.github/workflows/scheduled.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ jobs:
494494
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
495495
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
496496
relenv-version: "0.22.23"
497-
python-version: "3.11.15"
497+
python-version: "3.11.16"
498498
ci-python-version: "3.14"
499499
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
500500
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -511,7 +511,7 @@ jobs:
511511
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
512512
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
513513
relenv-version: "0.22.23"
514-
python-version: "3.11.15"
514+
python-version: "3.11.16"
515515
ci-python-version: "3.14"
516516
source: "onedir"
517517
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -528,7 +528,7 @@ jobs:
528528
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
529529
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
530530
relenv-version: "0.22.23"
531-
python-version: "3.11.15"
531+
python-version: "3.11.16"
532532
ci-python-version: "3.14"
533533
source: "src"
534534
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -543,10 +543,10 @@ jobs:
543543
with:
544544
nox-session: ci-test-onedir
545545
nox-version: 2022.8.7
546-
python-version: "3.11.15"
546+
python-version: "3.11.16"
547547
ci-python-version: "3.14"
548548
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
549-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
549+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
550550
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
551551
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
552552
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -563,7 +563,7 @@ jobs:
563563
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
564564
nox-version: 2022.8.7
565565
ci-python-version: "3.14"
566-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
566+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
567567
skip-code-coverage: true
568568
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
569569
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -581,7 +581,7 @@ jobs:
581581
ci-python-version: "3.14"
582582
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
583583
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
584-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
584+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
585585
skip-code-coverage: true
586586
workflow-slug: scheduled
587587
default-timeout: 360

‎.github/workflows/staging.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ jobs:
468468
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
469469
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
470470
relenv-version: "0.22.23"
471-
python-version: "3.11.15"
471+
python-version: "3.11.16"
472472
ci-python-version: "3.14"
473473
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
474474
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -486,7 +486,7 @@ jobs:
486486
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
487487
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
488488
relenv-version: "0.22.23"
489-
python-version: "3.11.15"
489+
python-version: "3.11.16"
490490
ci-python-version: "3.14"
491491
source: "onedir"
492492
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -508,7 +508,7 @@ jobs:
508508
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
509509
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
510510
relenv-version: "0.22.23"
511-
python-version: "3.11.15"
511+
python-version: "3.11.16"
512512
ci-python-version: "3.14"
513513
source: "src"
514514
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -527,10 +527,10 @@ jobs:
527527
with:
528528
nox-session: ci-test-onedir
529529
nox-version: 2022.8.7
530-
python-version: "3.11.15"
530+
python-version: "3.11.16"
531531
ci-python-version: "3.14"
532532
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
533-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
533+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
534534
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
535535
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
536536
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -547,7 +547,7 @@ jobs:
547547
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
548548
nox-version: 2022.8.7
549549
ci-python-version: "3.14"
550-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
550+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
551551
skip-code-coverage: true
552552
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
553553
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -565,7 +565,7 @@ jobs:
565565
ci-python-version: "3.14"
566566
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
567567
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
568-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.15
568+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.16
569569
skip-code-coverage: true
570570
workflow-slug: staging
571571
default-timeout: 180

‎cicd/shared-gh-workflows-context.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
nox_version: "2022.8.7"
2-
python_version: "3.11.15"
2+
python_version: "3.11.16"
33
relenv_version: "0.22.23"
44
release_branches:
55
- "3006.x"

‎cicd/windows-ssl-104135-patch.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
1111
The build-deps-ci Windows job extracts the salt onedir, then runs
1212
``nox --install-only -e ci-test-onedir`` and ``nox -e pre-archive-cleanup``.
13-
Both sessions target the onedir's relenv-bundled Python (3.10.20 on 3006.x)
13+
Both sessions target the onedir's relenv-bundled Python (3.10.21 on 3006.x)
1414
and create virtualenvs from it. The ``ci-test-onedir`` session uses
1515
``--system-site-packages``; ``pre-archive-cleanup`` does not. Either way,
1616
both venvs share the onedir's ``Lib/ssl.py`` because virtualenv leaves the

‎tools/ci.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ def _onedir_build_matrix(os_kind, linux_arm_runner, python_versions=None):
173173
"""
174174
if python_versions is None:
175175
python_versions = [
176-
"3.10.20",
177-
"3.11.15",
178-
"3.12.13",
179-
"3.13.14",
176+
"3.10.21",
177+
"3.11.16",
178+
"3.12.14",
179+
"3.13.15",
180180
]
181181
_matrix = []
182182
if os_kind == "windows":

0 commit comments

Comments
 (0)