Merge branch '3006.x' into x509-v2-signing-key-policy

saltstack · May 9, 2024 · b8e8c81 · b8e8c81
2 parents ee2866d + 591a19d
commit b8e8c81
Show file tree

Hide file tree

Showing 144 changed files with 2,256 additions and 2,021 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ on:
 
 env:
  COLUMNS: 190
- CACHE_SEED: SEED-1 # Bump the number to invalidate all caches
+ CACHE_SEED: SEED-2 # Bump the number to invalidate all caches
  RELENV_DATA: "${{ github.workspace }}/.relenv"
  PIP_DISABLE_PIP_VERSION_CHECK: "1"
  RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
@@ -184,7 +184,7 @@ jobs:
  nox-version: 2022.8.7
  python-version: "3.10"
  salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
- cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
  nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
 
  backup:
@@ -266,7 +266,7 @@ jobs:
  uses: ./.github/workflows/test-package-downloads-action.yml
  with:
  nox-session: ci-test-onedir
- cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
+ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
  salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
  environment: release
  nox-version: 2022.8.7