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

Prefer using macos instead of darwin

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2024-01-02 15:17:33 +00:00 • committed by Daniel Wozniak
parent ab4b5e7ae9
commit 5ea3bf3a9d
17 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build-deps-ci-action.yml vendored
View file

@ -190,7 +190,7 @@ jobs:
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
uses: actions/download-artifact@v3
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
path: artifacts/
- name: Decompress Onedir Tarball
@ -199,7 +199,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 }}.tar.xz
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
- name: Set up Python ${{ inputs.python-version }}
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'

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

@ -118,7 +118,7 @@ jobs:
id: setup-relenv
uses: ./.github/actions/setup-relenv
with:
platform: darwin
platform: macos
arch: ${{ matrix.arch }}
version: ${{ inputs.relenv-version }}
cache-seed: ${{ inputs.cache-seed }}
@ -127,7 +127,7 @@ jobs:
- name: Install Salt Packaging Dependencies into Relenv Onedir
uses: ./.github/actions/build-onedir-deps
with:
platform: darwin
platform: macos
arch: ${{ matrix.arch }}
python-version: "${{ inputs.python-version }}"
cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }}

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

@ -102,7 +102,7 @@ jobs:
- name: Download Onedir Tarball as an Artifact
uses: actions/download-artifact@v3
with:
name: salt-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz
name: salt-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
path: artifacts/
- name: Prepare Package Signing
@ -135,7 +135,7 @@ jobs:
tools pkg build macos --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
inputs.source == 'onedir' &&
format(
'--onedir salt-{0}-onedir-darwin-{1}.tar.xz --salt-version {0} {2}',
'--onedir salt-{0}-onedir-macos-{1}.tar.xz --salt-version {0} {2}',
inputs.salt-version,
matrix.arch,
steps.check-pkg-sign.outputs.sign-pkgs == 'true' && '--sign' || ''

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

@ -118,7 +118,7 @@ jobs:
id: setup-relenv
uses: ./.github/actions/setup-relenv
with:
platform: darwin
platform: macos
arch: ${{ matrix.arch }}
version: ${{ inputs.relenv-version }}
cache-seed: ${{ inputs.cache-seed }}
@ -138,7 +138,7 @@ jobs:
- name: Install Salt into Relenv Onedir
uses: ./.github/actions/build-onedir-salt
with:
platform: darwin
platform: macos
arch: ${{ matrix.arch }}
salt-version: "${{ inputs.salt-version }}"
python-version: "${{ inputs.python-version }}"

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

@ -1005,7 +1005,7 @@ jobs:
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1027,7 +1027,7 @@ jobs:
with:
distro-slug: macos-13
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1049,7 +1049,7 @@ jobs:
with:
distro-slug: macos-13-xlarge
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1268,7 +1268,7 @@ jobs:
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
@ -1290,7 +1290,7 @@ jobs:
with:
distro-slug: macos-13
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
@ -1312,7 +1312,7 @@ jobs:
with:
distro-slug: macos-13-xlarge
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: arm64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"

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

@ -1062,7 +1062,7 @@ jobs:
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1084,7 +1084,7 @@ jobs:
with:
distro-slug: macos-13
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1106,7 +1106,7 @@ jobs:
with:
distro-slug: macos-13-xlarge
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1325,7 +1325,7 @@ jobs:
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
@ -1347,7 +1347,7 @@ jobs:
with:
distro-slug: macos-13
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
@ -1369,7 +1369,7 @@ jobs:
with:
distro-slug: macos-13-xlarge
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: arm64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
@ -2836,13 +2836,13 @@ jobs:
- name: Download macOS x86_64 Onedir Archive
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-macos-x86_64.tar.xz
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-arm64.tar.xz
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-macos-arm64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Windows amd64 Onedir Archive

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

@ -137,9 +137,9 @@ jobs:
arch: amd64
- platform: windows
arch: x86
- platform: darwin
- platform: macos
arch: x86_64
- platform: darwin
- platform: macos
arch: arm64
steps:
- uses: actions/checkout@v4

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

@ -1039,7 +1039,7 @@ jobs:
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1061,7 +1061,7 @@ jobs:
with:
distro-slug: macos-13
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1083,7 +1083,7 @@ jobs:
with:
distro-slug: macos-13-xlarge
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1302,7 +1302,7 @@ jobs:
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
@ -1324,7 +1324,7 @@ jobs:
with:
distro-slug: macos-13
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
@ -1346,7 +1346,7 @@ jobs:
with:
distro-slug: macos-13-xlarge
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: arm64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"

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

@ -1052,7 +1052,7 @@ jobs:
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1074,7 +1074,7 @@ jobs:
with:
distro-slug: macos-13
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1096,7 +1096,7 @@ jobs:
with:
distro-slug: macos-13-xlarge
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: arm64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos
@ -1315,7 +1315,7 @@ jobs:
with:
distro-slug: macos-12
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
@ -1337,7 +1337,7 @@ jobs:
with:
distro-slug: macos-13
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
@ -1359,7 +1359,7 @@ jobs:
with:
distro-slug: macos-13-xlarge
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: arm64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
@ -2683,13 +2683,13 @@ jobs:
- name: Download macOS x86_64 Onedir Archive
uses: actions/download-artifact@v3
with:
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-macos-x86_64.tar.xz
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-arm64.tar.xz
name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-macos-arm64.tar.xz
path: artifacts/pkgs/incoming
- name: Download Windows amd64 Onedir Archive

4
.github/workflows/templates/build-deps-ci-action.yml.jinja vendored
View file

@ -190,7 +190,7 @@ jobs:
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
uses: actions/download-artifact@v3
with:
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-darwin-${{ matrix.arch }}.tar.xz
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
path: artifacts/
- name: Decompress Onedir Tarball
@ -199,7 +199,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 }}.tar.xz
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
- name: Set up Python ${{ inputs.python-version }}
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'

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

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

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

@ -171,9 +171,9 @@ permissions:
arch: amd64
- platform: windows
arch: x86
- platform: darwin
- platform: macos
arch: x86_64
- platform: darwin
- platform: macos
arch: arm64
steps:
- uses: actions/checkout@v4

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

@ -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 }}.tar.xz
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ 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 }}.tar.xz
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
- name: Set up Python ${{ inputs.python-version }}
uses: actions/setup-python@v4

2
.github/workflows/templates/test-salt-pkg.yml.jinja vendored
View file

@ -46,7 +46,7 @@
with:
distro-slug: <{ slug }>
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: <{ arch }>
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: macos

2
.github/workflows/templates/test-salt.yml.jinja vendored
View file

@ -45,7 +45,7 @@
with:
distro-slug: <{ slug }>
nox-session: ci-test-onedir
platform: darwin
platform: macos
arch: <{ arch }>
nox-version: <{ nox_version }>
gh-actions-python-version: "<{ gh_actions_workflows_python_version }>"

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

@ -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 }}.tar.xz
name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ 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 }}.tar.xz
tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz
- name: Set up Python ${{ inputs.python-version }}
uses: actions/setup-python@v4

2
tools/pkg/build.py
View file

@ -562,7 +562,7 @@ def onedir_dependencies(
/ "static"
/ "pkg"
/ f"py{requirements_version}"
/ f"{platform}.txt"
/ f"{platform if platform != 'macos' else 'darwin'}.txt"
)
_check_pkg_build_files_exist(ctx, requirements_file=requirements_file)