Consolidate onedir deps and onedir actions

This commit is contained in:
Daniel A. Wozniak 2025-03-05 20:01:37 -07:00 committed by Daniel Wozniak
parent a83582cab1
commit 8c725027db

View file

@ -29,21 +29,30 @@ runs:
steps:
- name: Download Cached Deps Onedir Package Directory
id: onedir-bare-cache
uses: ./.github/actions/cache
#- name: Download Cached Deps Onedir Package Directory
# id: onedir-bare-cache
# uses: ./.github/actions/cache
# with:
# 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',
# '.github/workflows/build-deps-onedir-*.yml',
# 'cicd/shared-gh-workflows-context.yml'
# )
# }}
- name: Install Salt Packaging Dependencies into Relenv Onedir
uses: ./.github/actions/build-onedir-deps
# if: steps.onedir-bare-cache.outputs.cache-hit != 'true'
with:
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',
'.github/workflows/build-deps-onedir-*.yml',
'cicd/shared-gh-workflows-context.yml'
)
}}
platform: ${{ inputs.platform }}
arch: ${{ inputs.arch }}
python-version: "${{ inputs.python-version }}"
cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ inputs.salt-version }}
- name: Download Source Tarball
uses: actions/download-artifact@v4