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

Fix RPM build repository for aarch64

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2024-01-17 06:04:09 +00:00 • committed by Pedro Algarvio
parent 00e094518d
commit 9e7b942cba
4 changed files with 16 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2569,7 +2569,7 @@ jobs:
- name: Download RPM Packages
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-rpm
path: artifacts/pkgs/incoming
- name: Setup GnuPG

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

@ -2411,7 +2411,7 @@ jobs:
- name: Download RPM Packages
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-rpm
path: artifacts/pkgs/incoming
- name: Setup GnuPG

38
.github/workflows/templates/build-rpm-repo.yml.jinja vendored
View file

@ -3,41 +3,7 @@
fail-fast: false
matrix:
include:
<%- for distro, version, arch in (
("amazon", "2", "x86_64"),
("amazon", "2", "arm64"),
("amazon", "2", "aarch64"),
("amazon", "2023", "x86_64"),
("amazon", "2023", "arm64"),
("amazon", "2023", "aarch64"),
("redhat", "7", "x86_64"),
("redhat", "7", "arm64"),
("redhat", "7", "aarch64"),
("redhat", "8", "x86_64"),
("redhat", "8", "arm64"),
("redhat", "8", "aarch64"),
("redhat", "9", "x86_64"),
("redhat", "9", "arm64"),
("redhat", "9", "aarch64"),
("fedora", "36", "x86_64"),
("fedora", "36", "arm64"),
("fedora", "36", "aarch64"),
("fedora", "37", "x86_64"),
("fedora", "37", "arm64"),
("fedora", "37", "aarch64"),
("fedora", "38", "x86_64"),
("fedora", "38", "arm64"),
("fedora", "38", "aarch64"),
("photon", "3", "x86_64"),
("photon", "3", "arm64"),
("photon", "3", "aarch64"),
("photon", "4", "x86_64"),
("photon", "4", "arm64"),
("photon", "4", "aarch64"),
("photon", "5", "x86_64"),
("photon", "5", "arm64"),
("photon", "5", "aarch64"),
) %>
<%- for distro, version, arch in build_rpms_listing %>
- pkg-type: rpm
distro: <{ distro }>
version: "<{ version }>"
@ -66,7 +32,7 @@
- name: Download RPM Packages
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-rpm
path: artifacts/pkgs/incoming
- name: Setup GnuPG

12
tools/precommit/workflows.py
View file

@ -252,6 +252,17 @@ def generate_workflows(ctx: Context):
for _, arch, _ in test_salt_pkg_downloads_listing[platform]:
test_salt_pkg_downloads_needs_slugs.add("build-ci-deps")
build_rpms_listing = []
for distro, releases in (
("amazon", ("2", "2023")),
("redhat", ("7", "8", "9")),
("fedora", ("36", "37", "38")),
("photon", ("3", "4", "5")),
):
for release in releases:
for arch in ("x86_64", "arm64", "aarch64"):
build_rpms_listing.append((distro, release, arch))
env = Environment(
block_start_string="<%",
block_end_string="%>",
@ -293,6 +304,7 @@ def generate_workflows(ctx: Context):
"test_salt_pkg_downloads_needs_slugs": sorted(
test_salt_pkg_downloads_needs_slugs
),
"build_rpms_listing": build_rpms_listing,
}
shared_context = yaml.safe_load(
tools.utils.SHARED_WORKFLOW_CONTEXT_FILEPATH.read_text()