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 2

Stop using aarch64

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2024-01-02 11:02:09 +00:00 • committed by Daniel Wozniak
parent 602aa0cbf7
commit af8ae6d3b7
14 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/build-deps-onedir.yml vendored
View file

@ -45,7 +45,7 @@ jobs:
matrix:
arch:
- x86_64
- aarch64
- arm64
runs-on:
- self-hosted
- linux
@ -69,7 +69,7 @@ jobs:
uses: ./.github/actions/setup-relenv
with:
platform: linux
arch: ${{ matrix.arch }}
arch: ${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}
version: ${{ inputs.relenv-version }}
cache-seed: ${{ inputs.cache-seed }}
python-version: ${{ inputs.python-version }}
@ -91,9 +91,9 @@ jobs:
matrix:
arch:
- x86_64
- aarch64
- arm64
runs-on:
- ${{ matrix.arch == 'aarch64' && 'macos-13-xlarge' || 'macos-12' }}
- ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
steps:
@ -119,7 +119,7 @@ jobs:
uses: ./.github/actions/setup-relenv
with:
platform: darwin
arch: ${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
arch: ${{ matrix.arch }}
version: ${{ inputs.relenv-version }}
cache-seed: ${{ inputs.cache-seed }}
python-version: ${{ inputs.python-version }}

10
.github/workflows/build-packages.yml vendored
View file

@ -52,12 +52,12 @@ jobs:
matrix:
arch:
- x86_64
- aarch64
- arm64
source:
- ${{ inputs.source }}
runs-on:
- ${{ matrix.arch == 'aarch64' && 'macos-13-xlarge' || 'macos-12' }}
- ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
steps:
- name: Check Package Signing Enabled
@ -172,7 +172,7 @@ jobs:
matrix:
arch:
- x86_64
- aarch64
- arm64
source:
- ${{ inputs.source }}
@ -270,7 +270,7 @@ jobs:
matrix:
arch:
- x86_64
- aarch64
- arm64
source:
- ${{ inputs.source }}
@ -335,7 +335,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: ${{ steps.set-artifact-name.outputs.artifact-name }}
path: ~/rpmbuild/RPMS/${{ matrix.arch }}/*.rpm
path: ~/rpmbuild/RPMS/*/*.rpm
retention-days: 7
if-no-files-found: error

10
.github/workflows/build-salt-onedir.yml vendored
View file

@ -45,7 +45,7 @@ jobs:
matrix:
arch:
- x86_64
- aarch64
- arm64
runs-on:
- self-hosted
- linux
@ -75,7 +75,7 @@ jobs:
id: setup-relenv
with:
platform: linux
arch: ${{ matrix.arch }}
arch: ${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}
version: ${{ inputs.relenv-version }}
cache-seed: ${{ inputs.cache-seed }}
python-version: ${{ inputs.python-version }}
@ -98,9 +98,9 @@ jobs:
matrix:
arch:
- x86_64
- aarch64
- arm64
runs-on:
- ${{ matrix.arch == 'aarch64' && 'macos-13-xlarge' || 'macos-12' }}
- ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
steps:
- name: "Throttle Builds"
@ -119,7 +119,7 @@ jobs:
uses: ./.github/actions/setup-relenv
with:
platform: darwin
arch: ${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
arch: ${{ matrix.arch }}
version: ${{ inputs.relenv-version }}
cache-seed: ${{ inputs.cache-seed }}
python-version: ${{ inputs.python-version }}

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

@ -2267,7 +2267,7 @@ jobs:
- pkg-type: deb
distro: debian
version: "10"
arch: aarch64
arch: arm64
- pkg-type: deb
distro: debian
version: "11"
@ -2275,7 +2275,7 @@ jobs:
- pkg-type: deb
distro: debian
version: "11"
arch: aarch64
arch: arm64
- pkg-type: deb
distro: debian
version: "12"
@ -2283,7 +2283,7 @@ jobs:
- pkg-type: deb
distro: debian
version: "12"
arch: aarch64
arch: arm64
- pkg-type: deb
distro: ubuntu
version: "20.04"
@ -2291,7 +2291,7 @@ jobs:
- pkg-type: deb
distro: ubuntu
version: "20.04"
arch: aarch64
arch: arm64
- pkg-type: deb
distro: ubuntu
version: "22.04"
@ -2299,7 +2299,7 @@ jobs:
- pkg-type: deb
distro: ubuntu
version: "22.04"
arch: aarch64
arch: arm64
steps:
- uses: actions/checkout@v4
@ -2544,7 +2544,7 @@ jobs:
- name: Download RPM Packages
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}-rpm
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm
path: artifacts/pkgs/incoming
- name: Setup GnuPG
@ -2740,7 +2740,7 @@ jobs:
- name: Download macOS Arch64 Packages
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-aarch64-macos
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-arm64-macos
path: artifacts/pkgs/incoming
- name: Setup GnuPG
@ -2827,10 +2827,10 @@ jobs:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-x86_64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Linux aarch64 Onedir Archive
- name: Download Linux arm64 Onedir Archive
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-aarch64.tar.xz
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-arm64.tar.xz
path: artifacts/pkgs/incoming
- name: Download macOS x86_64 Onedir Archive
@ -2842,7 +2842,7 @@ jobs:
- 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
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-arm64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Windows amd64 Onedir Archive

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

@ -132,7 +132,7 @@ jobs:
- platform: linux
arch: x86_64
- platform: linux
arch: aarch64
arch: arm64
- platform: windows
arch: amd64
- platform: windows
@ -140,7 +140,7 @@ jobs:
- platform: darwin
arch: x86_64
- platform: darwin
arch: aarch64
arch: arm64
steps:
- uses: actions/checkout@v4

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

@ -2112,7 +2112,7 @@ jobs:
- pkg-type: deb
distro: debian
version: "10"
arch: aarch64
arch: arm64
- pkg-type: deb
distro: debian
version: "11"
@ -2120,7 +2120,7 @@ jobs:
- pkg-type: deb
distro: debian
version: "11"
arch: aarch64
arch: arm64
- pkg-type: deb
distro: debian
version: "12"
@ -2128,7 +2128,7 @@ jobs:
- pkg-type: deb
distro: debian
version: "12"
arch: aarch64
arch: arm64
- pkg-type: deb
distro: ubuntu
version: "20.04"
@ -2136,7 +2136,7 @@ jobs:
- pkg-type: deb
distro: ubuntu
version: "20.04"
arch: aarch64
arch: arm64
- pkg-type: deb
distro: ubuntu
version: "22.04"
@ -2144,7 +2144,7 @@ jobs:
- pkg-type: deb
distro: ubuntu
version: "22.04"
arch: aarch64
arch: arm64
steps:
- uses: actions/checkout@v4
@ -2389,7 +2389,7 @@ jobs:
- name: Download RPM Packages
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}-rpm
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm
path: artifacts/pkgs/incoming
- name: Setup GnuPG
@ -2587,7 +2587,7 @@ jobs:
- name: Download macOS Arch64 Packages
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-aarch64-macos
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-arm64-macos
path: artifacts/pkgs/incoming
- name: Setup GnuPG
@ -2674,10 +2674,10 @@ jobs:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-x86_64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Linux aarch64 Onedir Archive
- name: Download Linux arm64 Onedir Archive
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-aarch64.tar.xz
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-arm64.tar.xz
path: artifacts/pkgs/incoming
- name: Download macOS x86_64 Onedir Archive
@ -2689,7 +2689,7 @@ jobs:
- 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
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-arm64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Windows amd64 Onedir Archive

10
.github/workflows/templates/build-deb-repo.yml.jinja vendored
View file

@ -5,15 +5,15 @@
include:
<%- for distro, version, arch in (
("debian", "10", "x86_64"),
("debian", "10", "aarch64"),
("debian", "10", "arm64"),
("debian", "11", "x86_64"),
("debian", "11", "aarch64"),
("debian", "11", "arm64"),
("debian", "12", "x86_64"),
("debian", "12", "aarch64"),
("debian", "12", "arm64"),
("ubuntu", "20.04", "x86_64"),
("ubuntu", "20.04", "aarch64"),
("ubuntu", "20.04", "arm64"),
("ubuntu", "22.04", "x86_64"),
("ubuntu", "22.04", "aarch64"),
("ubuntu", "22.04", "arm64"),
) %>
- pkg-type: deb
distro: <{ distro }>

2
.github/workflows/templates/build-macos-repo.yml.jinja vendored
View file

@ -28,7 +28,7 @@
- name: Download macOS Arch64 Packages
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-aarch64-macos
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-arm64-macos
path: artifacts/pkgs/incoming
- name: Setup GnuPG

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

@ -25,10 +25,10 @@
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-x86_64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Linux aarch64 Onedir Archive
- name: Download Linux arm64 Onedir Archive
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-aarch64.tar.xz
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-linux-arm64.tar.xz
path: artifacts/pkgs/incoming
- name: Download macOS x86_64 Onedir Archive
@ -40,7 +40,7 @@
- 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
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-arm64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Windows amd64 Onedir Archive

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

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

4
.github/workflows/templates/release.yml.jinja vendored
View file

@ -166,7 +166,7 @@ permissions:
- platform: linux
arch: x86_64
- platform: linux
arch: aarch64
arch: arm64
- platform: windows
arch: amd64
- platform: windows
@ -174,7 +174,7 @@ permissions:
- platform: darwin
arch: x86_64
- platform: darwin
arch: aarch64
arch: arm64
steps:
- uses: actions/checkout@v4

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

@ -84,7 +84,7 @@ jobs:
- name: Download Onedir Tarball as an Artifact
uses: actions/download-artifact@v3
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}.tar.xz
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz
path: artifacts/
- name: Decompress Onedir Tarball
@ -92,7 +92,7 @@ jobs:
run: |
python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
cd artifacts
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}.tar.xz
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz
- name: Download cached nox.linux.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3.3.1
@ -318,7 +318,7 @@ jobs:
- name: Download Onedir Tarball as an Artifact
uses: actions/download-artifact@v3
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}.tar.xz
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz
path: artifacts/
- name: Install System Dependencies
@ -330,7 +330,7 @@ jobs:
run: |
python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
cd artifacts
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}.tar.xz
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz
- name: Set up Python ${{ inputs.python-version }}
uses: actions/setup-python@v4

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

@ -163,7 +163,7 @@ jobs:
- name: Download Onedir Tarball as an Artifact
uses: actions/download-artifact@v3
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}.tar.xz
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz
path: artifacts/
- name: Decompress Onedir Tarball
@ -171,7 +171,7 @@ jobs:
run: |
python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
cd artifacts
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}.tar.xz
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz
- name: Download cached nox.linux.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
uses: actions/cache@v3.3.1
@ -404,7 +404,7 @@ jobs:
- name: Download Onedir Tarball as an Artifact
uses: actions/download-artifact@v3
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}.tar.xz
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz
path: artifacts/
- name: Install System Dependencies
@ -416,7 +416,7 @@ jobs:
run: |
python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
cd artifacts
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}.tar.xz
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz
- name: Set up Python ${{ inputs.python-version }}
uses: actions/setup-python@v4

6
tools/pkg/build.py
View file

@ -447,7 +447,7 @@ def windows(
arguments={
"arch": {
"help": "The architecture to build the package for",
"choices": ("x86_64", "aarch64", "x86", "amd64"),
"choices": ("x86_64", "arm64", "x86", "amd64"),
"required": True,
},
"python_version": {
@ -486,8 +486,8 @@ def onedir_dependencies(
assert package_name is not None
assert platform is not None
if platform in ("macos", "darwin") and arch == "aarch64":
arch = "arm64"
if platform not in ("macos", "darwin") and arch == "arm64":
arch = "aarch64"
shared_constants = _get_shared_constants()
if not python_version: