Skip to content

Commit 7c0ab50

Browse files
dwozdwoz
authored
Merge pull request #67892 from dwoz/merge/3007.x/3006.x
Merge forward 3006.x into 3007.x
2 parents bd819e6 + 21ff77c commit 7c0ab50

File tree

168 files changed

+2212
-2045
lines changed

Some content is hidden

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

168 files changed

+2212
-2045
lines changed

‎.github/actions/setup-actionlint/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Setup actionlint
55
inputs:
66
version:
77
description: The version of actionlint
8-
default: 1.6.26
8+
default: 1.7.7
99
cache-seed:
1010
required: true
1111
description: Seed used to invalidate caches

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,8 @@ jobs:
429429
with:
430430
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
431431
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
432-
relenv-version: "0.18.1"
433-
python-version: "3.10.16"
432+
relenv-version: "0.19.0"
433+
python-version: "3.10.17"
434434
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
435435
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
436436

@@ -444,8 +444,8 @@ jobs:
444444
with:
445445
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
446446
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
447-
relenv-version: "0.18.1"
448-
python-version: "3.10.16"
447+
relenv-version: "0.19.0"
448+
python-version: "3.10.17"
449449
source: "onedir"
450450
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
451451
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -461,7 +461,7 @@ jobs:
461461
nox-version: 2022.8.7
462462
python-version: "3.10"
463463
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
464-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
464+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
465465
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
466466
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
467467
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -478,7 +478,7 @@ jobs:
478478
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
479479
nox-version: 2022.8.7
480480
python-version: "3.10"
481-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
481+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
482482
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
483483
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
484484
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -496,7 +496,7 @@ jobs:
496496
python-version: "3.10"
497497
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
498498
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
499-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
499+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
500500
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
501501
workflow-slug: ci
502502
default-timeout: 180

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,21 @@ jobs:
4949
env:
5050
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5151
with:
52-
release_name: "Release v${{ inputs.salt-version }}"
52+
release_name: "v${{ inputs.salt-version }}"
5353
tag_name: v${{ inputs.salt-version }}
5454
draft: true
5555
prerelease: false
5656
- name: Release Output
5757
run: echo "upload_url=${{ steps.create_release.outputs.upload_url }}" >> "$GITHUB_OUTPUT"
5858

59+
upload-release-patch:
60+
needs:
61+
- create-github-release
62+
uses: ./.github/workflows/release-artifact.yml
63+
with:
64+
name: salt-${{ inputs.salt-version }}.patch
65+
upload_url: ${{ needs.create-github-release.outputs.upload_url }}
66+
5967
upload-source-tarball:
6068
needs:
6169
- create-github-release

‎.github/workflows/nightly.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -486,8 +486,8 @@ jobs:
486486
with:
487487
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
488488
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
489-
relenv-version: "0.18.1"
490-
python-version: "3.10.16"
489+
relenv-version: "0.19.0"
490+
python-version: "3.10.17"
491491
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
492492
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
493493

@@ -501,8 +501,8 @@ jobs:
501501
with:
502502
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
503503
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
504-
relenv-version: "0.18.1"
505-
python-version: "3.10.16"
504+
relenv-version: "0.19.0"
505+
python-version: "3.10.17"
506506
source: "onedir"
507507
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
508508
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -521,8 +521,8 @@ jobs:
521521
with:
522522
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
523523
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
524-
relenv-version: "0.18.1"
525-
python-version: "3.10.16"
524+
relenv-version: "0.19.0"
525+
python-version: "3.10.17"
526526
source: "src"
527527
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
528528
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -542,7 +542,7 @@ jobs:
542542
nox-version: 2022.8.7
543543
python-version: "3.10"
544544
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
545-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
545+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
546546
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
547547
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
548548
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -559,7 +559,7 @@ jobs:
559559
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
560560
nox-version: 2022.8.7
561561
python-version: "3.10"
562-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
562+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
563563
skip-code-coverage: true
564564
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
565565
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -577,7 +577,7 @@ jobs:
577577
python-version: "3.10"
578578
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
579579
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
580-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.16
580+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
581581
skip-code-coverage: true
582582
workflow-slug: nightly
583583
default-timeout: 360

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

Lines changed: 0 additions & 84 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
6060
- name: Create Pull Request
6161
id: cpr
62-
uses: peter-evans/create-pull-request@v5
62+
uses: peter-evans/create-pull-request@v7
6363
with:
6464
path: winrepo
6565
push-to-fork: saltbot-open/salt-winrepo-ng

0 commit comments

Comments
 (0)