Skip to content

Commit 17d0169

Browse files
dwozdwoz
authored
Merge pull request #68562 from dwoz/merge/3007.x/master-25-12-18
Merge 3007.x forward into master
2 parents e3c222b + 97444bd commit 17d0169

File tree

158 files changed

+3354
-602155
lines changed

Some content is hidden

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

158 files changed

+3354
-602155
lines changed

‎.github/workflows/build-deps-ci-action.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ on:
5151

5252
env:
5353
COLUMNS: 190
54+
RELENV_DATA: "${{ github.workspace }}/.relenv"
5455
AWS_MAX_ATTEMPTS: "10"
5556
AWS_RETRY_MODE: "adaptive"
5657
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}

‎.github/workflows/build-docs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
# - linkcheck
3434
# - spellcheck
3535
- html
36+
- man
3637

3738
steps:
3839
- uses: actions/checkout@v4

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

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ jobs:
7575
include: ${{ fromJSON(inputs.matrix)['linux'] }}
7676

7777
container:
78-
image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-12
78+
image: ghcr.io/saltstack/salt-ci-containers/testing:debian-13
79+
80+
env:
81+
RELENV_DATA: "${{ github.workspace }}/.relenv"
7982

8083
steps:
8184
# Checkout here so we can easily use custom actions
@@ -101,6 +104,15 @@ jobs:
101104
path:
102105
pkgs/checkout/
103106

107+
- name: Install build dependencies
108+
run: |
109+
# Installing python3.13-venv for Python 3.13 support
110+
apt-get install -y python3.13-venv
111+
# Installing devscripts for source package builds (provides debuild)
112+
apt-get install -y devscripts
113+
# Installing patchelf for relenv ELF binary patching
114+
apt-get install -y patchelf
115+
104116
- name: Download Onedir Tarball as an Artifact
105117
if: inputs.source == 'onedir'
106118
uses: actions/download-artifact@v4
@@ -123,6 +135,12 @@ jobs:
123135
name: salt-${{ inputs.salt-version }}.patch
124136
path: pkgs/checkout/
125137

138+
- name: Download MAN Pages
139+
uses: actions/download-artifact@v4
140+
with:
141+
name: man-pages-${{ inputs.salt-version }}
142+
path: pkgs/checkout/doc/man/
143+
126144
- name: Setup Python Tools Scripts
127145
uses: ./.github/actions/setup-python-tools-scripts
128146
with:
@@ -191,11 +209,18 @@ jobs:
191209
include: ${{ fromJSON(inputs.matrix)['linux'] }}
192210

193211
container:
194-
image: ghcr.io/saltstack/salt-ci-containers/packaging:rockylinux-9
212+
image: ghcr.io/saltstack/salt-ci-containers/testing:fedora-42
213+
214+
env:
215+
RELENV_DATA: "${{ github.workspace }}/.relenv"
195216

196217
steps:
197218
- uses: actions/checkout@v4
198219

220+
- name: Install rpmsign
221+
run: |
222+
dnf install -y rpmsign
223+
199224
- name: Download Onedir Tarball as an Artifact
200225
if: inputs.source == 'onedir'
201226
uses: actions/download-artifact@v4
@@ -217,6 +242,12 @@ jobs:
217242
with:
218243
name: salt-${{ inputs.salt-version }}.patch
219244

245+
- name: Download MAN Pages
246+
uses: actions/download-artifact@v4
247+
with:
248+
name: man-pages-${{ inputs.salt-version }}
249+
path: doc/man/
250+
220251
- name: Setup Python Tools Scripts
221252
uses: ./.github/actions/setup-python-tools-scripts
222253
with:
@@ -343,6 +374,12 @@ jobs:
343374
name: salt-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
344375
path: artifacts/
345376

377+
- name: Download MAN Pages
378+
uses: actions/download-artifact@v4
379+
with:
380+
name: man-pages-${{ inputs.salt-version }}
381+
path: doc/man/
382+
346383
- name: Setup Keychain
347384
if: ${{ steps.check-pkg-sign.outputs.sign-pkgs == 'true' }}
348385
env:
@@ -495,6 +532,12 @@ jobs:
495532
name: salt-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.zip
496533
path: artifacts/
497534

535+
- name: Download MAN Pages
536+
uses: actions/download-artifact@v4
537+
with:
538+
name: man-pages-${{ inputs.salt-version }}
539+
path: doc/man/
540+
498541
- name: Setup Certificate
499542
if: ${{ steps.check-pkg-sign.outputs.sign-pkgs == 'true' }}
500543
shell: bash

‎.github/workflows/ci.yml‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -334,13 +334,20 @@ jobs:
334334
335335
- name: Generate MAN Pages
336336
shell: bash
337-
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
338337
env:
339338
LATEST_RELEASE: "${{ needs.prepare-workflow.outputs.salt-version }}"
340339
SALT_ON_SALTSTACK: "1"
341340
run: |
342341
tools docs man
343342
343+
- name: Upload MAN Pages Artifact
344+
uses: actions/upload-artifact@v4
345+
with:
346+
name: man-pages-${{ needs.prepare-workflow.outputs.salt-version }}
347+
path: doc/man/
348+
retention-days: 7
349+
if-no-files-found: error
350+
344351
- name: Update Changelog
345352
shell: bash
346353
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
@@ -399,7 +406,7 @@ jobs:
399406
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-docs'] }}
400407
needs:
401408
- prepare-workflow
402-
- build-source-tarball
409+
- prepare-release
403410
uses: ./.github/workflows/build-docs.yml
404411
with:
405412
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
@@ -411,6 +418,7 @@ jobs:
411418
needs:
412419
- prepare-workflow
413420
- prepare-release
421+
- build-docs
414422
runs-on: ubuntu-22.04
415423
steps:
416424
- uses: actions/checkout@v4
@@ -431,6 +439,20 @@ jobs:
431439
with:
432440
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
433441

442+
- name: Download Man Pages Artifact
443+
uses: actions/download-artifact@v4
444+
with:
445+
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-docs-man.tar.xz
446+
447+
- name: Extract and Remove Man Pages Artifact
448+
shell: bash
449+
run: |
450+
pwd
451+
mkdir -p doc/man
452+
tar -xvf salt-${{ needs.prepare-workflow.outputs.salt-version }}-docs-man.tar.xz -C doc/man
453+
ls -la doc/man
454+
rm salt-${{ needs.prepare-workflow.outputs.salt-version }}-docs-man.tar.xz
455+
434456
- name: Build Source Tarball
435457
uses: ./.github/actions/build-source-tarball
436458
with:
@@ -441,12 +463,13 @@ jobs:
441463
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir'] }}
442464
needs:
443465
- prepare-workflow
466+
- build-docs
444467
- build-source-tarball
445468
uses: ./.github/workflows/build-salt-onedir.yml
446469
with:
447470
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
448471
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
449-
relenv-version: "0.21.2"
472+
relenv-version: "0.22.1"
450473
python-version: "3.11.14"
451474
ci-python-version: "3.11"
452475
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -463,7 +486,7 @@ jobs:
463486
with:
464487
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
465488
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
466-
relenv-version: "0.21.2"
489+
relenv-version: "0.22.1"
467490
python-version: "3.11.14"
468491
ci-python-version: "3.11"
469492
source: "onedir"
@@ -480,7 +503,7 @@ jobs:
480503
with:
481504
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
482505
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
483-
relenv-version: "0.21.2"
506+
relenv-version: "0.22.1"
484507
python-version: "3.11.14"
485508
ci-python-version: "3.11"
486509
source: "src"

‎.github/workflows/nightly.yml‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,20 @@ jobs:
329329
330330
- name: Generate MAN Pages
331331
shell: bash
332-
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
333332
env:
334333
LATEST_RELEASE: "${{ needs.prepare-workflow.outputs.salt-version }}"
335334
SALT_ON_SALTSTACK: "1"
336335
run: |
337336
tools docs man
338337
338+
- name: Upload MAN Pages Artifact
339+
uses: actions/upload-artifact@v4
340+
with:
341+
name: man-pages-${{ needs.prepare-workflow.outputs.salt-version }}
342+
path: doc/man/
343+
retention-days: 7
344+
if-no-files-found: error
345+
339346
- name: Update Changelog
340347
shell: bash
341348
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
@@ -394,7 +401,7 @@ jobs:
394401
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-docs'] }}
395402
needs:
396403
- prepare-workflow
397-
- build-source-tarball
404+
- prepare-release
398405
uses: ./.github/workflows/build-docs.yml
399406
with:
400407
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
@@ -406,6 +413,7 @@ jobs:
406413
needs:
407414
- prepare-workflow
408415
- prepare-release
416+
- build-docs
409417
runs-on: ubuntu-22.04
410418
steps:
411419
- uses: actions/checkout@v4
@@ -426,6 +434,20 @@ jobs:
426434
with:
427435
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
428436

437+
- name: Download Man Pages Artifact
438+
uses: actions/download-artifact@v4
439+
with:
440+
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-docs-man.tar.xz
441+
442+
- name: Extract and Remove Man Pages Artifact
443+
shell: bash
444+
run: |
445+
pwd
446+
mkdir -p doc/man
447+
tar -xvf salt-${{ needs.prepare-workflow.outputs.salt-version }}-docs-man.tar.xz -C doc/man
448+
ls -la doc/man
449+
rm salt-${{ needs.prepare-workflow.outputs.salt-version }}-docs-man.tar.xz
450+
429451
- name: Build Source Tarball
430452
uses: ./.github/actions/build-source-tarball
431453
with:
@@ -436,12 +458,13 @@ jobs:
436458
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir'] }}
437459
needs:
438460
- prepare-workflow
461+
- build-docs
439462
- build-source-tarball
440463
uses: ./.github/workflows/build-salt-onedir.yml
441464
with:
442465
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
443466
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
444-
relenv-version: "0.21.2"
467+
relenv-version: "0.22.1"
445468
python-version: "3.11.14"
446469
ci-python-version: "3.11"
447470
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -458,7 +481,7 @@ jobs:
458481
with:
459482
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
460483
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
461-
relenv-version: "0.21.2"
484+
relenv-version: "0.22.1"
462485
python-version: "3.11.14"
463486
ci-python-version: "3.11"
464487
source: "onedir"
@@ -479,7 +502,7 @@ jobs:
479502
with:
480503
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
481504
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
482-
relenv-version: "0.21.2"
505+
relenv-version: "0.22.1"
483506
python-version: "3.11.14"
484507
ci-python-version: "3.11"
485508
source: "src"

‎.github/workflows/scheduled.yml‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -377,13 +377,20 @@ jobs:
377377
378378
- name: Generate MAN Pages
379379
shell: bash
380-
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
381380
env:
382381
LATEST_RELEASE: "${{ needs.prepare-workflow.outputs.salt-version }}"
383382
SALT_ON_SALTSTACK: "1"
384383
run: |
385384
tools docs man
386385
386+
- name: Upload MAN Pages Artifact
387+
uses: actions/upload-artifact@v4
388+
with:
389+
name: man-pages-${{ needs.prepare-workflow.outputs.salt-version }}
390+
path: doc/man/
391+
retention-days: 7
392+
if-no-files-found: error
393+
387394
- name: Update Changelog
388395
shell: bash
389396
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
@@ -442,7 +449,7 @@ jobs:
442449
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-docs'] }}
443450
needs:
444451
- prepare-workflow
445-
- build-source-tarball
452+
- prepare-release
446453
uses: ./.github/workflows/build-docs.yml
447454
with:
448455
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
@@ -454,6 +461,7 @@ jobs:
454461
needs:
455462
- prepare-workflow
456463
- prepare-release
464+
- build-docs
457465
runs-on: ubuntu-22.04
458466
steps:
459467
- uses: actions/checkout@v4
@@ -474,6 +482,20 @@ jobs:
474482
with:
475483
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
476484

485+
- name: Download Man Pages Artifact
486+
uses: actions/download-artifact@v4
487+
with:
488+
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-docs-man.tar.xz
489+
490+
- name: Extract and Remove Man Pages Artifact
491+
shell: bash
492+
run: |
493+
pwd
494+
mkdir -p doc/man
495+
tar -xvf salt-${{ needs.prepare-workflow.outputs.salt-version }}-docs-man.tar.xz -C doc/man
496+
ls -la doc/man
497+
rm salt-${{ needs.prepare-workflow.outputs.salt-version }}-docs-man.tar.xz
498+
477499
- name: Build Source Tarball
478500
uses: ./.github/actions/build-source-tarball
479501
with:
@@ -484,12 +506,13 @@ jobs:
484506
if: ${{ !cancelled() && fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir'] }}
485507
needs:
486508
- prepare-workflow
509+
- build-docs
487510
- build-source-tarball
488511
uses: ./.github/workflows/build-salt-onedir.yml
489512
with:
490513
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
491514
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
492-
relenv-version: "0.21.2"
515+
relenv-version: "0.22.1"
493516
python-version: "3.11.14"
494517
ci-python-version: "3.11"
495518
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -506,7 +529,7 @@ jobs:
506529
with:
507530
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
508531
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
509-
relenv-version: "0.21.2"
532+
relenv-version: "0.22.1"
510533
python-version: "3.11.14"
511534
ci-python-version: "3.11"
512535
source: "onedir"
@@ -523,7 +546,7 @@ jobs:
523546
with:
524547
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
525548
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
526-
relenv-version: "0.21.2"
549+
relenv-version: "0.22.1"
527550
python-version: "3.11.14"
528551
ci-python-version: "3.11"
529552
source: "src"

0 commit comments

Comments
 (0)