Skip to content

Commit

Permalink
Merge branch '3006.x' into fix_env
Browse files Browse the repository at this point in the history
  • Loading branch information
@cmcmarrow
cmcmarrow authored Sep 5, 2023
2 parents 254c2ec + acc6b2e commit aba580f
Show file tree
Hide file tree
Showing 17 changed files with 1,109 additions and 326 deletions.
110 changes: 55 additions & 55 deletions .github/workflows/ci.yml
View file

Large diffs are not rendered by default.

110 changes: 55 additions & 55 deletions .github/workflows/nightly.yml
View file

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ jobs:
distro-slug: almalinux-8
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -256,7 +256,7 @@ jobs:
distro-slug: almalinux-8-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -277,7 +277,7 @@ jobs:
distro-slug: almalinux-9
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -298,7 +298,7 @@ jobs:
distro-slug: almalinux-9-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -319,7 +319,7 @@ jobs:
distro-slug: amazonlinux-2
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -340,7 +340,7 @@ jobs:
distro-slug: amazonlinux-2-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -361,7 +361,7 @@ jobs:
distro-slug: centos-7
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -382,7 +382,7 @@ jobs:
distro-slug: centos-7-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -403,7 +403,7 @@ jobs:
distro-slug: centosstream-8
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -424,7 +424,7 @@ jobs:
distro-slug: centosstream-8-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -445,7 +445,7 @@ jobs:
distro-slug: centosstream-9
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -466,7 +466,7 @@ jobs:
distro-slug: centosstream-9-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -487,7 +487,7 @@ jobs:
distro-slug: debian-10
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -508,7 +508,7 @@ jobs:
distro-slug: debian-11
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -529,7 +529,7 @@ jobs:
distro-slug: debian-11-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -550,7 +550,7 @@ jobs:
distro-slug: fedora-37
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -571,7 +571,7 @@ jobs:
distro-slug: fedora-37-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -592,7 +592,7 @@ jobs:
distro-slug: fedora-38
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -613,7 +613,7 @@ jobs:
distro-slug: fedora-38-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -634,7 +634,7 @@ jobs:
distro-slug: photonos-3
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -655,7 +655,7 @@ jobs:
distro-slug: photonos-4
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -676,7 +676,7 @@ jobs:
distro-slug: ubuntu-20.04
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -697,7 +697,7 @@ jobs:
distro-slug: ubuntu-20.04-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -718,7 +718,7 @@ jobs:
distro-slug: ubuntu-22.04
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -739,7 +739,7 @@ jobs:
distro-slug: ubuntu-22.04-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -760,7 +760,7 @@ jobs:
distro-slug: ubuntu-22.04
platform: linux
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -781,7 +781,7 @@ jobs:
distro-slug: ubuntu-22.04-arm64
platform: linux
arch: aarch64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
nox-version: 2022.8.7
Expand All @@ -802,7 +802,7 @@ jobs:
distro-slug: macos-12
platform: darwin
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
skip-code-coverage: true
Expand All @@ -823,7 +823,7 @@ jobs:
distro-slug: macos-12
platform: darwin
arch: x86_64
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
skip-code-coverage: true
Expand All @@ -845,7 +845,7 @@ jobs:
platform: windows
arch: amd64
pkg-type: nsis
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
skip-code-coverage: true
Expand All @@ -866,7 +866,7 @@ jobs:
platform: windows
arch: amd64
pkg-type: msi
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
skip-code-coverage: true
Expand All @@ -887,7 +887,7 @@ jobs:
platform: windows
arch: amd64
pkg-type: onedir
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
environment: release
skip-code-coverage: true
Expand Down
Loading

0 comments on commit aba580f

Please sign in to comment.