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

saltstack · May 13, 2024 · a97efc7 · a97efc7
2 parents b8e8c81 + 86245dc
commit a97efc7
Show file tree

Hide file tree

Showing 75 changed files with 2,235 additions and 1,980 deletions.
diff --git a/.github/actions/download-artifact/action.yml b/.github/actions/download-artifact/action.yml
diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml
@@ -46,9 +46,7 @@ runs:
  shopt -s globstar || echo "'globstar' not available"
  tar -cavf ${{ inputs.archive-name || inputs.name || 'archive' }}.tar.gz ${{ inputs.path }}
 
- - uses: actions/upload-artifact@v3
- # This needs to be actions/upload-artifact@v3 because we upload multiple artifacts
- # under the same name something that actions/upload-artifact@v4 does not do.
+ - uses: actions/upload-artifact@v4
  with:
  name: ${{ inputs.name }}
  path: ${{ inputs.archive-name || inputs.name || 'archive' }}.tar.gz

diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml
@@ -47,8 +47,36 @@ env:
 
 jobs:
 
+ generate-matrix:
+ name: Generate Matrix
+ runs-on: ubuntu-latest
+ outputs:
+ matrix-include: ${{ steps.generate-matrix.outputs.matrix }}
+ steps:
+
+ - name: "Throttle Builds"
+ shell: bash
+ run: |
+ t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
+ - name: Checkout Source Code
+ uses: actions/checkout@v4
+
+ - name: Setup Python Tools Scripts
+ uses: ./.github/actions/setup-python-tools-scripts
+ with:
+ cache-prefix: ${{ inputs.cache-prefix }}
+
+ - name: Generate Test Matrix
+ id: generate-matrix
+ run: |
+ tools ci deps-matrix
+
+
  linux-dependencies:
  name: Linux
+ needs:
+ - generate-matrix
  runs-on:
  - self-hosted
  - linux
@@ -59,11 +87,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- include:
- - distro-slug: centos-7
- arch: x86_64
- - distro-slug: centos-7-arm64
- arch: arm64
+ include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['linux'] }}
  steps:
 
  - name: "Throttle Builds"
@@ -163,16 +187,14 @@ jobs:
 
  macos-dependencies:
  name: MacOS
+ needs:
+ - generate-matrix
  runs-on: ${{ matrix.distro-slug == 'macos-13-arm64' && 'macos-13-xlarge' || matrix.distro-slug }}
  timeout-minutes: 90
  strategy:
  fail-fast: false
  matrix:
- include:
- - distro-slug: macos-12
- arch: x86_64
- - distro-slug: macos-13-arm64
- arch: arm64
+ include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }}
  steps:
 
  - name: "Throttle Builds"
@@ -250,6 +272,8 @@ jobs:
  path: nox.macos.${{ matrix.arch }}.tar.*
 
  windows-dependencies:
+ needs:
+ - generate-matrix
  name: Windows
  runs-on:
  - self-hosted
@@ -261,9 +285,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- include:
- - distro-slug: windows-2022
- arch: amd64
+ include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['windows'] }}
  steps:
 
  - name: "Throttle Builds"

diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml
@@ -92,9 +92,7 @@ jobs:
  fail-fast: false
  max-parallel: 2
  matrix:
- arch:
- - x86_64
- - arm64
+ arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }}
  runs-on:
  - ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
  env:

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -51,9 +51,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- arch:
- - x86_64
- - arm64
+ arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }}
  source:
  - ${{ inputs.source }}
 

diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml
@@ -99,9 +99,7 @@ jobs:
  fail-fast: false
  max-parallel: 2
  matrix:
- arch:
- - x86_64
- - arm64
+ arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }}
  runs-on:
  - ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}