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

Actually update build-onedir-deps/action.yml

Browse source
This commit is contained in:
MKLeb 2023-03-08 12:52:14 -05:00 • committed by Megan Wilhite
parent 36ca1926f6
commit 4a669e9f52
2 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
.github/actions/build-onedir-deps/action.yml vendored
View file

@ -43,37 +43,11 @@ runs:
path: artifacts/${{ inputs.package-name }}
key: ${{ inputs.cache-prefix }}|${{ inputs.python-version }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{ hashFiles(format('{0}/.relenv/**/*.xz', github.workspace), 'requirements/static/pkg/*/*.txt', '.github/actions/build-onedir-deps/action.yml') }}
- name: Create Onedir Directory
shell: bash
if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
run: |
python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
python3 -m relenv create --arch=${{ inputs.arch }} --python=${{ inputs.python-version }} artifacts/${{ inputs.package-name }}
- name: Get Onedir Python Version
id: get-python-version
if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
uses: ./.github/actions/get-python-version
with:
python-binary: artifacts/${{ inputs.package-name }}/${{ inputs.platform == 'windows' && 'Scripts/python' || 'bin/python3' }}
- name: Install Wheel & Upgrade Setuptools & Pip
shell: bash
if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
run: |
${{ steps.get-python-version.outputs.binary }} -m pip install -U "wheel"
${{ steps.get-python-version.outputs.binary }} -m pip install -U "pip>=22.3.1,<23.0"
${{ steps.get-python-version.outputs.binary }} -m pip install -U "setuptools>=65.6.3,<66"
- name: Install Salt Onedir Package Dependencies
shell: bash
if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
run: |
if [ "${{ inputs.platform }}" != "windows" ]; then
${{ steps.get-python-version.outputs.binary }} -m pip install -r requirements/static/pkg/py${{ steps.get-python-version.outputs.version }}/${{ inputs.platform }}.txt --no-binary=':all:'
else
${{ steps.get-python-version.outputs.binary }} -m pip install -r requirements/static/pkg/py${{ steps.get-python-version.outputs.version }}/${{ inputs.platform }}.txt
fi
tools pkg build onedir-dependencies --arch ${{ inputs.arch }} --python-version ${{ inputs.python-version }} --package-name ${{ inputs.package-name }} --platform ${{ inputs.platform }}
- name: Cleanup Salt Onedir Directory
shell: bash

3
tools/pkg/build.py
View file

@ -214,7 +214,7 @@ def windows(
arguments={
"arch": {
"help": "The architecture to build the package for",
"choices": ("x86_64", "aarch64"),
"choices": ("x86_64", "aarch64", "x86", "aarch64"),
"required": True,
},
"python_version": {
@ -247,6 +247,7 @@ def onedir_dependencies(
assert arch is not None
assert python_version is not None
assert package_name is not None
assert platform is not None
# We import relenv here because it is not a hard requirement for the rest of the tools commands
try: