Skip to content

Commit 17a9837

Browse files
author
Megan Wilhite
authored
Merge pull request #64998 from s0undt3ch/hotfix/merge-forward
[master] Merge 3006.x into master
2 parents ba433a7 + cc83478 commit 17a9837

File tree

133 files changed

+1502
-741
lines changed

Some content is hidden

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

133 files changed

+1502
-741
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ env:
2222
permissions:
2323
contents: read # for dorny/paths-filter to fetch a list of changed files
2424
pull-requests: read # for dorny/paths-filter to read pull requests
25+
actions: read # for technote-space/workflow-conclusion-action to get the job statuses
2526

2627
concurrency:
2728
# Concurrency is defined in a way that concurrent builds against branches do
@@ -35,7 +36,7 @@ jobs:
3536

3637
prepare-workflow:
3738
name: Prepare Workflow Run
38-
runs-on: ubuntu-latest
39+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
3940
outputs:
4041
jobs: ${{ steps.define-jobs.outputs.jobs }}
4142
runners: ${{ steps.runner-types.outputs.runners }}
@@ -266,8 +267,7 @@ jobs:
266267
prepare-release:
267268
name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}"
268269
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['prepare-release'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
269-
runs-on:
270-
- ubuntu-latest
270+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "medium", "x86_64"]') || 'ubuntu-latest' }}
271271
needs:
272272
- prepare-workflow
273273
steps:
@@ -416,7 +416,7 @@ jobs:
416416
needs:
417417
- prepare-workflow
418418
- prepare-release
419-
runs-on: ubuntu-latest
419+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "medium", "x86_64"]') || 'ubuntu-latest' }}
420420
steps:
421421
- uses: actions/checkout@v3
422422

@@ -463,7 +463,7 @@ jobs:
463463
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
464464
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
465465
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
466-
relenv-version: "0.13.2"
466+
relenv-version: "0.13.4"
467467
python-version: "3.10.12"
468468

469469
build-salt-onedir:
@@ -479,7 +479,7 @@ jobs:
479479
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
480480
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
481481
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
482-
relenv-version: "0.13.2"
482+
relenv-version: "0.13.4"
483483
python-version: "3.10.12"
484484

485485
build-rpm-pkgs:
@@ -491,7 +491,7 @@ jobs:
491491
uses: ./.github/workflows/build-rpm-packages.yml
492492
with:
493493
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
494-
relenv-version: "0.13.2"
494+
relenv-version: "0.13.4"
495495
python-version: "3.10.12"
496496

497497
build-deb-pkgs:
@@ -503,7 +503,7 @@ jobs:
503503
uses: ./.github/workflows/build-deb-packages.yml
504504
with:
505505
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
506-
relenv-version: "0.13.2"
506+
relenv-version: "0.13.4"
507507
python-version: "3.10.12"
508508

509509
build-windows-pkgs:
@@ -515,7 +515,7 @@ jobs:
515515
uses: ./.github/workflows/build-windows-packages.yml
516516
with:
517517
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
518-
relenv-version: "0.13.2"
518+
relenv-version: "0.13.4"
519519
python-version: "3.10.12"
520520

521521
build-macos-pkgs:
@@ -527,7 +527,7 @@ jobs:
527527
uses: ./.github/workflows/build-macos-packages.yml
528528
with:
529529
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
530-
relenv-version: "0.13.2"
530+
relenv-version: "0.13.4"
531531
python-version: "3.10.12"
532532

533533
amazonlinux-2-pkg-tests:
@@ -1309,7 +1309,7 @@ jobs:
13091309
# on a pull request instead of requiring all
13101310
name: Set the ${{ github.workflow }} Pipeline Exit Status
13111311
if: always()
1312-
runs-on: ubuntu-latest
1312+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
13131313
needs:
13141314
- prepare-workflow
13151315
- pre-commit

‎.github/workflows/lint-action.yml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,21 @@ env:
1818
jobs:
1919
Salt:
2020
name: Lint Salt's Source Code
21-
runs-on: ubuntu-latest
21+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "large", "x86_64"]') || 'ubuntu-latest' }}
2222
if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['salt'] || fromJSON(inputs.changed-files)['lint'] }}
2323

2424
container:
25-
image: python:3.8-slim-buster
25+
image: ghcr.io/saltstack/salt-ci-containers/python:3.8
2626

2727
steps:
2828
- name: Install System Deps
2929
run: |
30-
echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
3130
apt-get update
32-
apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
33-
apt-get install -y git/buster-backports
31+
apt-get install -y enchant-2 git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
32+
33+
- name: Add Git Safe Directory
34+
run: |
35+
git config --global --add safe.directory "$(pwd)"
3436
3537
- uses: actions/checkout@v3
3638

@@ -60,19 +62,22 @@ jobs:
6062
6163
Tests:
6264
name: Lint Salt's Test Suite
63-
runs-on: ubuntu-latest
65+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "large", "x86_64"]') || 'ubuntu-latest' }}
6466
if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['tests'] || fromJSON(inputs.changed-files)['lint'] }}
6567

6668
container:
67-
image: python:3.8-slim-buster
69+
image: ghcr.io/saltstack/salt-ci-containers/python:3.8
6870

6971
steps:
7072
- name: Install System Deps
7173
run: |
72-
echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
74+
echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list
7375
apt-get update
74-
apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
75-
apt-get install -y git/buster-backports
76+
apt-get install -y enchant-2 git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
77+
78+
- name: Add Git Safe Directory
79+
run: |
80+
git config --global --add safe.directory "$(pwd)"
7681
7782
- uses: actions/checkout@v3
7883

‎.github/workflows/nightly.yml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
workflow-requirements:
4040
name: Check Workflow Requirements
41-
runs-on: ubuntu-latest
41+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
4242
outputs:
4343
requirements-met: ${{ steps.check-requirements.outputs.requirements-met }}
4444
steps:
@@ -65,8 +65,7 @@ jobs:
6565
trigger-branch-nightly-builds:
6666
name: Trigger Branch Workflows
6767
if: ${{ github.event_name == 'schedule' && fromJSON(needs.workflow-requirements.outputs.requirements-met) }}
68-
runs-on:
69-
- ubuntu-latest
68+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
7069
needs:
7170
- workflow-requirements
7271
steps:
@@ -78,7 +77,7 @@ jobs:
7877
7978
prepare-workflow:
8079
name: Prepare Workflow Run
81-
runs-on: ubuntu-latest
80+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
8281
if: ${{ fromJSON(needs.workflow-requirements.outputs.requirements-met) }}
8382
needs:
8483
- workflow-requirements
@@ -312,8 +311,7 @@ jobs:
312311
prepare-release:
313312
name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}"
314313
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['prepare-release'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
315-
runs-on:
316-
- ubuntu-latest
314+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "medium", "x86_64"]') || 'ubuntu-latest' }}
317315
needs:
318316
- prepare-workflow
319317
steps:
@@ -462,7 +460,7 @@ jobs:
462460
needs:
463461
- prepare-workflow
464462
- prepare-release
465-
runs-on: ubuntu-latest
463+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "medium", "x86_64"]') || 'ubuntu-latest' }}
466464
steps:
467465
- uses: actions/checkout@v3
468466

@@ -509,7 +507,7 @@ jobs:
509507
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
510508
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
511509
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
512-
relenv-version: "0.13.2"
510+
relenv-version: "0.13.4"
513511
python-version: "3.10.12"
514512

515513
build-salt-onedir:
@@ -525,7 +523,7 @@ jobs:
525523
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
526524
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
527525
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
528-
relenv-version: "0.13.2"
526+
relenv-version: "0.13.4"
529527
python-version: "3.10.12"
530528

531529
build-rpm-pkgs:
@@ -537,7 +535,7 @@ jobs:
537535
uses: ./.github/workflows/build-rpm-packages.yml
538536
with:
539537
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
540-
relenv-version: "0.13.2"
538+
relenv-version: "0.13.4"
541539
python-version: "3.10.12"
542540

543541
build-deb-pkgs:
@@ -549,7 +547,7 @@ jobs:
549547
uses: ./.github/workflows/build-deb-packages.yml
550548
with:
551549
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
552-
relenv-version: "0.13.2"
550+
relenv-version: "0.13.4"
553551
python-version: "3.10.12"
554552

555553
build-windows-pkgs:
@@ -561,7 +559,7 @@ jobs:
561559
uses: ./.github/workflows/build-windows-packages.yml
562560
with:
563561
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
564-
relenv-version: "0.13.2"
562+
relenv-version: "0.13.4"
565563
python-version: "3.10.12"
566564
environment: nightly
567565
sign-packages: false
@@ -576,7 +574,7 @@ jobs:
576574
uses: ./.github/workflows/build-macos-packages.yml
577575
with:
578576
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
579-
relenv-version: "0.13.2"
577+
relenv-version: "0.13.4"
580578
python-version: "3.10.12"
581579
environment: nightly
582580
sign-packages: true
@@ -2064,7 +2062,7 @@ jobs:
20642062
# on a pull request instead of requiring all
20652063
name: Set the ${{ github.workflow }} Pipeline Exit Status
20662064
if: always()
2067-
runs-on: ubuntu-latest
2065+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
20682066
environment: nightly
20692067
needs:
20702068
- workflow-requirements

‎.github/workflows/pre-commit-action.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,21 @@ jobs:
2121
Pre-Commit:
2222
name: Run Pre-Commit Against Salt
2323

24-
runs-on: ubuntu-latest
24+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
2525

2626
container:
27-
image: python:3.10-slim-buster
27+
image: ghcr.io/saltstack/salt-ci-containers/python:3.10
2828

2929
steps:
3030

3131
- name: Install System Deps
3232
run: |
33-
echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
3433
apt-get update
35-
apt-get install -y wget curl enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
36-
apt-get install -y git/buster-backports
34+
apt-get install -y wget curl enchant-2 git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
35+
36+
- name: Add Git Safe Directory
37+
run: |
38+
git config --global --add safe.directory "$(pwd)"
3739
3840
- uses: actions/checkout@v3
3941
- uses: ./.github/actions/setup-actionlint

‎.github/workflows/release-tag.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
permissions:
3232
contents: write # for dev-drprasad/delete-tag-and-release to delete tags or releases
3333
name: Generate Tag and Github Release
34-
runs-on: ubuntu-latest
34+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
3535
steps:
3636
- uses: dev-drprasad/delete-tag-and-release@v0.2.0
3737
if: github.event.inputs.reTag == 'true'

‎.github/workflows/release-update-winrepo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919
jobs:
2020
update-winrepo:
2121
name: Update Winrepo
22-
runs-on: ubuntu-latest
22+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
2323
steps:
2424

2525
- name: Checkout Salt

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
check-requirements:
3737
name: Check Requirements
38-
runs-on: ubuntu-latest
38+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
3939
environment: release-check
4040
steps:
4141
- name: Check For Admin Permission
@@ -87,6 +87,9 @@ jobs:
8787
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8888
run: |
8989
tools pkg repo confirm-unreleased --repository ${{ github.repository }} ${{ steps.setup-salt-version.outputs.salt-version }}
90+
if [ "${{ github.event.repository.private }}" = "true" ]; then
91+
tools pkg repo confirm-unreleased --repository saltstack/salt ${{ steps.setup-salt-version.outputs.salt-version }}
92+
fi
9093
9194
- name: Check Release Staged
9295
env:
@@ -1057,7 +1060,7 @@ jobs:
10571060
# on a pull request instead of requiring all
10581061
name: Set the ${{ github.workflow }} Pipeline Exit Status
10591062
if: always()
1060-
runs-on: ubuntu-latest
1063+
runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
10611064
needs:
10621065
- check-requirements
10631066
- prepare-workflow

0 commit comments

Comments
 (0)