saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 3006.x into master

Browse source
This commit is contained in:
Pedro Algarvio 2023-12-06 10:17:35 +00:00
commit b3d4a5e2c5
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
10 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View file

@ -16,7 +16,7 @@ on:
env: env:
COLUMNS: 190 COLUMNS: 190
CACHE_SEED: SEED-5 # Bump the number to invalidate all caches CACHE_SEED: SEED-7 # Bump the number to invalidate all caches
RELENV_DATA: "${{ github.workspace }}/.relenv" RELENV_DATA: "${{ github.workspace }}/.relenv"
permissions: permissions:

8
.github/workflows/nightly.yml vendored
View file

@ -22,7 +22,7 @@ on:
env: env:
COLUMNS: 190 COLUMNS: 190
CACHE_SEED: SEED-5 # Bump the number to invalidate all caches CACHE_SEED: SEED-7 # Bump the number to invalidate all caches
RELENV_DATA: "${{ github.workspace }}/.relenv" RELENV_DATA: "${{ github.workspace }}/.relenv"
permissions: permissions:
@ -3730,6 +3730,12 @@ jobs:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz
path: artifacts/pkgs/incoming path: artifacts/pkgs/incoming
- name: Download macOS arm64 Onedir Archive
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-aarch64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Windows amd64 Onedir Archive - name: Download Windows amd64 Onedir Archive
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:

2
.github/workflows/release.yml vendored
View file

@ -21,7 +21,7 @@ on:
env: env:
COLUMNS: 190 COLUMNS: 190
CACHE_SEED: SEED-5 # Bump the number to invalidate all caches CACHE_SEED: SEED-7 # Bump the number to invalidate all caches
RELENV_DATA: "${{ github.workspace }}/.relenv" RELENV_DATA: "${{ github.workspace }}/.relenv"
permissions: permissions:

2
.github/workflows/scheduled.yml vendored
View file

@ -12,7 +12,7 @@ on:
env: env:
COLUMNS: 190 COLUMNS: 190
CACHE_SEED: SEED-5 # Bump the number to invalidate all caches CACHE_SEED: SEED-7 # Bump the number to invalidate all caches
RELENV_DATA: "${{ github.workspace }}/.relenv" RELENV_DATA: "${{ github.workspace }}/.relenv"
permissions: permissions:

8
.github/workflows/staging.yml vendored
View file

@ -37,7 +37,7 @@ on:
env: env:
COLUMNS: 190 COLUMNS: 190
CACHE_SEED: SEED-5 # Bump the number to invalidate all caches CACHE_SEED: SEED-7 # Bump the number to invalidate all caches
RELENV_DATA: "${{ github.workspace }}/.relenv" RELENV_DATA: "${{ github.workspace }}/.relenv"
permissions: permissions:
@ -3541,6 +3541,12 @@ jobs:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz
path: artifacts/pkgs/incoming path: artifacts/pkgs/incoming
- name: Download macOS arm64 Onedir Archive
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-aarch64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Windows amd64 Onedir Archive - name: Download Windows amd64 Onedir Archive
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:

6
.github/workflows/templates/build-onedir-repo.yml.jinja vendored
View file

@ -37,6 +37,12 @@
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz
path: artifacts/pkgs/incoming path: artifacts/pkgs/incoming
- name: Download macOS arm64 Onedir Archive
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-aarch64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Windows amd64 Onedir Archive - name: Download Windows amd64 Onedir Archive
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:

2
.github/workflows/templates/layout.yml.jinja vendored
View file

@ -34,7 +34,7 @@ on:
env: env:
COLUMNS: 190 COLUMNS: 190
CACHE_SEED: SEED-5 # Bump the number to invalidate all caches CACHE_SEED: SEED-7 # Bump the number to invalidate all caches
RELENV_DATA: "${{ github.workspace }}/.relenv" RELENV_DATA: "${{ github.workspace }}/.relenv"
<%- endblock env %> <%- endblock env %>

2
.github/workflows/templates/test-package-downloads-action.yml.jinja vendored
View file

@ -346,7 +346,7 @@ jobs:
uses: actions/cache@v3.3.1 uses: actions/cache@v3.3.1
with: with:
path: nox.${{ matrix.distro-slug }}.tar.* path: nox.${{ matrix.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
}} }}
# If we get a cache miss here it means the dependencies step failed to save the cache # If we get a cache miss here it means the dependencies step failed to save the cache

4
.github/workflows/test-package-downloads-action.yml vendored
View file

@ -445,7 +445,7 @@ jobs:
arch: arm64 arch: arm64
pkg-type: package pkg-type: package
- distro-slug: macos-13-xlarge - distro-slug: macos-13-xlarge
arch: arm64 arch: aarch64
pkg-type: onedir pkg-type: onedir
steps: steps:
@ -489,7 +489,7 @@ jobs:
uses: actions/cache@v3.3.1 uses: actions/cache@v3.3.1
with: with:
path: nox.${{ matrix.distro-slug }}.tar.* path: nox.${{ matrix.distro-slug }}.tar.*
key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
}} }}
# If we get a cache miss here it means the dependencies step failed to save the cache # If we get a cache miss here it means the dependencies step failed to save the cache

2
tools/precommit/workflows.py
View file

@ -270,8 +270,6 @@ def generate_workflows(ctx: Context):
arch = "arm64" arch = "arm64"
test_salt_pkg_downloads_listing["macos"].append((slug, arch, "package")) test_salt_pkg_downloads_listing["macos"].append((slug, arch, "package"))
for slug, display_name, arch in build_ci_deps_listing["macos"][-1:]: for slug, display_name, arch in build_ci_deps_listing["macos"][-1:]:
if arch == "aarch64":
arch = "arm64"
test_salt_pkg_downloads_listing["macos"].append((slug, arch, "onedir")) test_salt_pkg_downloads_listing["macos"].append((slug, arch, "onedir"))
for slug, display_name, arch in build_ci_deps_listing["windows"][-1:]: for slug, display_name, arch in build_ci_deps_listing["windows"][-1:]:
for pkg_type in ("nsis", "msi", "onedir"): for pkg_type in ("nsis", "msi", "onedir"):