Skip to content

Commit e35479d

Browse files
dwozdwoz
authored
Merge pull request #68218 from dwoz/merge/3007.x/3006.x-25-0728
Merge forward 3006.x into 3007.x
2 parents 190409b + 22e9eca commit e35479d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+783
-211
lines changed

‎.github/actions/build-onedir-deps/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ runs:
3535
hashFiles(
3636
format('{0}/.relenv/**/*.xz', github.workspace),
3737
'requirements/static/pkg/*/*.txt',
38+
'tools/pkg/build.py',
3839
'.github/actions/build-onedir-deps/action.yml',
3940
'.github/workflows/build-deps-onedir-*.yml',
4041
'cicd/shared-gh-workflows-context.yml'

‎.github/actions/build-onedir-salt/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ runs:
3535
platform: ${{ inputs.platform }}
3636
arch: ${{ inputs.arch }}
3737
python-version: "${{ inputs.python-version }}"
38-
cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ inputs.salt-version }}
38+
cache-prefix: ${{ inputs.cache-prefix }}|relenv|${{ inputs.salt-version }}
3939

4040
- name: Download Source Tarball
4141
uses: actions/download-artifact@v4

‎.github/workflows/build-packages.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,20 @@ jobs:
102102
pkgs/checkout/
103103

104104
- name: Download Onedir Tarball as an Artifact
105+
if: inputs.source == 'onedir'
105106
uses: actions/download-artifact@v4
106107
with:
107108
name: salt-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz
108109
path: pkgs/checkout/artifacts/
109110

111+
- name: Install toolchain
112+
if: inputs.source != 'onedir'
113+
run: |
114+
mkdir -p ~/.local/relenv
115+
python3 -m venv venv
116+
venv/bin/python3 -m pip install relenv ppbt
117+
venv/bin/python3 -c 'from relenv import common; common.get_toolchain()'
118+
110119
- name: Download Release Patch
111120
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
112121
uses: actions/download-artifact@v4
@@ -188,11 +197,20 @@ jobs:
188197
- uses: actions/checkout@v4
189198

190199
- name: Download Onedir Tarball as an Artifact
200+
if: inputs.source == 'onedir'
191201
uses: actions/download-artifact@v4
192202
with:
193203
name: salt-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz
194204
path: artifacts/
195205

206+
- name: Install toolchain
207+
if: inputs.source != 'onedir'
208+
run: |
209+
mkdir -p ~/.local/relenv
210+
python3 -m venv venv
211+
venv/bin/python3 -m pip install relenv ppbt
212+
venv/bin/python3 -c 'from relenv import common; common.get_toolchain()'
213+
196214
- name: Download Release Patch
197215
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
198216
uses: actions/download-artifact@v4
@@ -319,6 +337,7 @@ jobs:
319337
salt-version: "${{ inputs.salt-version }}"
320338

321339
- name: Download Onedir Tarball as an Artifact
340+
if: inputs.source == 'onedir'
322341
uses: actions/download-artifact@v4
323342
with:
324343
name: salt-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
@@ -442,6 +461,7 @@ jobs:
442461
salt-version: "${{ inputs.salt-version }}"
443462

444463
- name: Download Onedir Tarball as an Artifact
464+
if: inputs.source == 'onedir'
445465
uses: actions/download-artifact@v4
446466
with:
447467
name: salt-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.zip

‎.github/workflows/ci.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,28 +437,46 @@ jobs:
437437
with:
438438
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
439439
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
440-
relenv-version: "0.20.1"
440+
relenv-version: "0.20.3"
441441
python-version: "3.10.18"
442442
ci-python-version: "3.11"
443443
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
444444
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
445445

446446
build-pkgs-onedir:
447-
name: Build Packages
448-
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
447+
name: Build Onedir Packages
448+
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
449449
needs:
450450
- prepare-workflow
451+
- build-source-tarball
451452
- build-salt-onedir
452453
uses: ./.github/workflows/build-packages.yml
453454
with:
454455
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
455456
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
456-
relenv-version: "0.20.1"
457+
relenv-version: "0.20.3"
457458
python-version: "3.10.18"
458459
ci-python-version: "3.11"
459460
source: "onedir"
460461
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
461462
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
463+
464+
build-pkgs-src:
465+
name: Build Source Packages
466+
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }}
467+
needs:
468+
- prepare-workflow
469+
- build-source-tarball
470+
uses: ./.github/workflows/build-packages.yml
471+
with:
472+
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
473+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
474+
relenv-version: "0.20.3"
475+
python-version: "3.10.18"
476+
ci-python-version: "3.11"
477+
source: "src"
478+
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
479+
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
462480
build-ci-deps:
463481
name: CI Deps
464482
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-ci'] }}
@@ -656,6 +674,7 @@ jobs:
656674
- nsis-tests
657675
- build-docs
658676
- build-salt-onedir
677+
- build-pkgs-src
659678
- combine-all-code-coverage
660679
- build-ci-deps
661680
- test-packages

‎.github/workflows/nightly.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -490,23 +490,24 @@ jobs:
490490
with:
491491
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
492492
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
493-
relenv-version: "0.20.1"
493+
relenv-version: "0.20.3"
494494
python-version: "3.10.18"
495495
ci-python-version: "3.11"
496496
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
497497
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
498498

499499
build-pkgs-onedir:
500-
name: Build Packages
501-
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
500+
name: Build Onedir Packages
501+
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
502502
needs:
503503
- prepare-workflow
504+
- build-source-tarball
504505
- build-salt-onedir
505506
uses: ./.github/workflows/build-packages.yml
506507
with:
507508
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
508509
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
509-
relenv-version: "0.20.1"
510+
relenv-version: "0.20.3"
510511
python-version: "3.10.18"
511512
ci-python-version: "3.11"
512513
source: "onedir"
@@ -518,16 +519,16 @@ jobs:
518519
sign-windows-packages: false
519520

520521
build-pkgs-src:
521-
name: Build Packages
522-
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
522+
name: Build Source Packages
523+
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }}
523524
needs:
524525
- prepare-workflow
525-
- build-salt-onedir
526+
- build-source-tarball
526527
uses: ./.github/workflows/build-packages.yml
527528
with:
528529
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
529530
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
530-
relenv-version: "0.20.1"
531+
relenv-version: "0.20.3"
531532
python-version: "3.10.18"
532533
ci-python-version: "3.11"
533534
source: "src"

‎.github/workflows/scheduled.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,28 +480,46 @@ jobs:
480480
with:
481481
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
482482
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
483-
relenv-version: "0.20.1"
483+
relenv-version: "0.20.3"
484484
python-version: "3.10.18"
485485
ci-python-version: "3.11"
486486
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
487487
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
488488

489489
build-pkgs-onedir:
490-
name: Build Packages
491-
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
490+
name: Build Onedir Packages
491+
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
492492
needs:
493493
- prepare-workflow
494+
- build-source-tarball
494495
- build-salt-onedir
495496
uses: ./.github/workflows/build-packages.yml
496497
with:
497498
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
498499
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
499-
relenv-version: "0.20.1"
500+
relenv-version: "0.20.3"
500501
python-version: "3.10.18"
501502
ci-python-version: "3.11"
502503
source: "onedir"
503504
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
504505
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
506+
507+
build-pkgs-src:
508+
name: Build Source Packages
509+
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }}
510+
needs:
511+
- prepare-workflow
512+
- build-source-tarball
513+
uses: ./.github/workflows/build-packages.yml
514+
with:
515+
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
516+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
517+
relenv-version: "0.20.3"
518+
python-version: "3.10.18"
519+
ci-python-version: "3.11"
520+
source: "src"
521+
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
522+
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
505523
build-ci-deps:
506524
name: CI Deps
507525
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-ci'] }}
@@ -571,6 +589,7 @@ jobs:
571589
- nsis-tests
572590
- build-docs
573591
- build-salt-onedir
592+
- build-pkgs-src
574593
- build-ci-deps
575594
- test-packages
576595
- test

‎.github/workflows/staging.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -468,24 +468,25 @@ jobs:
468468
with:
469469
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
470470
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
471-
relenv-version: "0.20.1"
471+
relenv-version: "0.20.3"
472472
python-version: "3.10.18"
473473
ci-python-version: "3.11"
474474
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
475475
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
476476

477477
build-pkgs-onedir:
478-
name: Build Packages
479-
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
478+
name: Build Onedir Packages
479+
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
480480
needs:
481481
- prepare-workflow
482+
- build-source-tarball
482483
- build-salt-onedir
483484
uses: ./.github/workflows/build-packages.yml
484485
secrets: inherit
485486
with:
486487
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
487488
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
488-
relenv-version: "0.20.1"
489+
relenv-version: "0.20.3"
489490
python-version: "3.10.18"
490491
ci-python-version: "3.11"
491492
source: "onedir"
@@ -497,17 +498,17 @@ jobs:
497498
sign-windows-packages: ${{ inputs.sign-windows-packages }}
498499

499500
build-pkgs-src:
500-
name: Build Packages
501-
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
501+
name: Build Source Packages
502+
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }}
502503
needs:
503504
- prepare-workflow
504-
- build-salt-onedir
505+
- build-source-tarball
505506
uses: ./.github/workflows/build-packages.yml
506507
secrets: inherit
507508
with:
508509
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
509510
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
510-
relenv-version: "0.20.1"
511+
relenv-version: "0.20.3"
511512
python-version: "3.10.18"
512513
ci-python-version: "3.11"
513514
source: "src"

‎.github/workflows/templates/build-packages.yml.jinja

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
<%- if gh_environment != "ci" -%>
21
<%- set pkg_types = ("onedir", "src") %>
3-
<%- else -%>
4-
<%- set pkg_types = ("onedir",) %>
5-
<%- endif -%>
2+
63
<%- for backend in pkg_types %>
74
<%- set job_name = "build-pkgs-{}".format(backend) %>
85
<%- if backend == "src" %>
96
<%- do conclusion_needs.append(job_name) %>
107
<%- endif %>
118

129
<{ job_name }>:
13-
name: Build Packages
14-
if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
10+
<%- if backend == "src" %>
11+
name: Build Source Packages
12+
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }}
13+
<%- else %>
14+
name: Build Onedir Packages
15+
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-pkgs'] }}
16+
<%- endif %>
1517
needs:
1618
- prepare-workflow
19+
- build-source-tarball
20+
<%- if backend == "onedir" %>
1721
- build-salt-onedir
22+
<%- endif %>
1823
uses: ./.github/workflows/build-packages.yml
1924
<% if gh_environment == 'staging' -%>
2025
secrets: inherit

‎changelog/68132.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed ssh_known_hosts.present failure when ssh host keys changed

‎changelog/68184.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
grains.disks: fix exception with incompatible output of Get-PhysicalDisk

0 commit comments

Comments
 (0)