diff --git a/action.yml b/action.yml index dc80f87..7010538 100644 --- a/action.yml +++ b/action.yml @@ -46,11 +46,11 @@ runs: run: | ${GITHUB_ACTION_PATH}/pre_cache_action.sh \ ~/cache-apt-pkgs \ - "$VERSION" \ - "$EXEC_INSTALL_SCRIPTS" \ - "$DEBUG" \ - "$PACKAGES" - echo "CACHE_KEY=$(cat ~/cache-apt-pkgs/cache_key.md5)" >> $GITHUB_ENV + "${{ inputs.version }}" \ + "${{ inputs.execute_install_scripts }}" \ + "${{ inputs.debug }}" \ + ${{ inputs.packages }} + echo "CACHE_APT_PKGS_ACTION_CACHE_KEY=$(cat ~/cache-apt-pkgs/cache_key.md5)" >> $GITHUB_ENV shell: bash env: VERSION: "${{ inputs.version }}" @@ -62,17 +62,17 @@ runs: uses: actions/cache/restore@v4 with: path: ~/cache-apt-pkgs - key: cache-apt-pkgs_${{ env.CACHE_KEY }} + key: cache-apt-pkgs_${{ env.CACHE_APT_PKGS_ACTION_CACHE_KEY }} - id: post-cache run: | ${GITHUB_ACTION_PATH}/post_cache_action.sh \ ~/cache-apt-pkgs \ / \ - "$CACHE_HIT" \ - "$EXEC_INSTALL_SCRIPTS" \ - "$DEBUG" \ - "$PACKAGES" + "${{ inputs.version }}" \ + "${{ inputs.execute_install_scripts }}" \ + "${{ inputs.debug }}" \ + ${{ inputs.packages }} 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 "all-package-version-list=$(create_list all)" >> $GITHUB_OUTPUT @@ -87,7 +87,7 @@ runs: #if: ${{ inputs.debug == 'true' }} uses: actions/upload-artifact@v3 with: - name: cache-apt-pkgs-logs_${{ env.CACHE_KEY }} + name: cache-apt-pkgs-logs_${{ env.CACHE_APT_PKGS_ACTION_CACHE_KEY }} path: ~/cache-apt-pkgs/*.log - id: save-cache