Skip to content

Commit fd9d34f

Browse files
authored
Merge branch 'master' into fix-59014
2 parents 7d098c9 + cf6c1e1 commit fd9d34f

File tree

2,226 files changed

+3302
-513107
lines changed

Some content is hidden

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

2,226 files changed

+3302
-513107
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Remove this section if not relevant
1919
### Commits signed with GPG?
2020
Yes/No
2121

22-
Please review [Salt's Contributing Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html) for best practices.
22+
Please review [Salt's Contributing Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html) for best practices, including the
23+
[PR Guidelines](https://docs.saltproject.io/en/master/topics/development/pull_requests.html).
2324

2425
See GitHub's [page on GPG signing](https://help.github.com/articles/signing-commits-using-gpg/) for more information about signing commits with GPG.

.github/workflows/ci.yml

Lines changed: 75 additions & 118 deletions
Large diffs are not rendered by default.

.github/workflows/nightly.yml

Lines changed: 73 additions & 124 deletions
Large diffs are not rendered by default.

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121

2222
env:
2323
COLUMNS: 190
24-
CACHE_SEED: SEED-1 # Bump the number to invalidate all caches
24+
CACHE_SEED: SEED-2 # Bump the number to invalidate all caches
2525
RELENV_DATA: "${{ github.workspace }}/.relenv"
2626
PIP_DISABLE_PIP_VERSION_CHECK: "1"
2727
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
@@ -184,7 +184,7 @@ jobs:
184184
nox-version: 2022.8.7
185185
python-version: "3.10"
186186
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
187-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
187+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
188188
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
189189

190190
backup:
@@ -266,7 +266,7 @@ jobs:
266266
uses: ./.github/workflows/test-package-downloads-action.yml
267267
with:
268268
nox-session: ci-test-onedir
269-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
269+
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
270270
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
271271
environment: release
272272
nox-version: 2022.8.7

0 commit comments

Comments
 (0)