Address block style package issue #84 #88

This commit is contained in:
awalsh128 2023-02-03 22:03:09 -08:00
parent 9b3b2b590c
commit 89bc6bed94

View file

@ -45,12 +45,17 @@ runs:
run: | run: |
${GITHUB_ACTION_PATH}/pre_cache_action.sh \ ${GITHUB_ACTION_PATH}/pre_cache_action.sh \
~/cache-apt-pkgs \ ~/cache-apt-pkgs \
"${{ inputs.version }}" \ "$VERSION" \
"${{ inputs.execute_install_scripts }}" \ "$EXEC_INSTALL_SCRIPTS" \
"${{ inputs.debug }}" \ "$DEBUG" \
${{ inputs.packages }} "$PACKAGES"
echo "CACHE_KEY=$(cat ~/cache-apt-pkgs/cache_key.md5)" >> $GITHUB_ENV echo "CACHE_KEY=$(cat ~/cache-apt-pkgs/cache_key.md5)" >> $GITHUB_ENV
shell: bash shell: bash
env:
VERSION: "${{ inputs.version }}"
EXEC_INSTALL_SCRIPTS: "${{ inputs.execute_install_scripts }}"
DEBUG: "${{ inputs.debug }}"
PACKAGES: "${{ inputs.packages }}"
- id: load-cache - id: load-cache
uses: actions/cache@v3 uses: actions/cache@v3
@ -63,17 +68,22 @@ runs:
${GITHUB_ACTION_PATH}/post_cache_action.sh \ ${GITHUB_ACTION_PATH}/post_cache_action.sh \
~/cache-apt-pkgs \ ~/cache-apt-pkgs \
/ \ / \
"${{ steps.load-cache.outputs.cache-hit }}" \ "$CACHE_HIT" \
"${{ inputs.execute_install_scripts }}" \ "$EXEC_INSTALL_SCRIPTS" \
"${{ inputs.debug }}" \ "$DEBUG" \
${{ inputs.packages }} "$PACKAGES"
function create_list { local list=$(cat ~/cache-apt-pkgs/manifest_${1}.log | tr '\n' ','); echo ${list:0:-1}; }; function create_list { local list=$(cat ~/cache-apt-pkgs/manifest_${1}.log | tr '\n' ','); echo ${list:0:-1}; };
echo "package-version-list=$(create_list main)" >> $GITHUB_OUTPUT echo "package-version-list=$(create_list main)" >> $GITHUB_OUTPUT
echo "all-package-version-list=$(create_list all)" >> $GITHUB_OUTPUT echo "all-package-version-list=$(create_list all)" >> $GITHUB_OUTPUT
shell: bash shell: bash
env:
CACHE_HIT: "${{ steps.load-cache.outputs.cache-hit }}"
EXEC_INSTALL_SCRIPTS: "${{ inputs.execute_install_scripts }}"
DEBUG: "${{ inputs.debug }}"
PACKAGES: "${{ inputs.packages }}"
- id: upload-logs - id: upload-logs
if: ${{ inputs.debug }} == "true" if: ${{ inputs.debug == 'true' }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: cache-apt-pkgs-logs%${{ inputs.packages }}%${{ inputs.version }} name: cache-apt-pkgs-logs%${{ inputs.packages }}%${{ inputs.version }}