From 622a4c5687fcd4d6cc05b4b463f48d42f57e4b94 Mon Sep 17 00:00:00 2001
From: Andrew Walsh <awalsh128@gmail.com>
Date: Fri, 3 Feb 2023 23:16:50 -0800
Subject: [PATCH] Sync dev to master. (#93)

* Address block style package issue #84 #88

* Use cache key for upload artifact name #89.

* Sync master back to dev. (#92)

* Fix if condition for upload-logs step (#87)

Previously the if condition was always evaluating to a truthy string
(e.g. 'false == "true"' or 'true == "true"') as the string comparison
(`== 'true'`) was not inside the expression syntax (`${{ }}`) and thus
being treated as a string rather than being evaluated.

* Introduce a force update value for reloading cache #82

---------

Co-authored-by: Leroy Hopson <github@leroy.geek.nz>

---------

Co-authored-by: Leroy Hopson <github@leroy.geek.nz>
---
 action.yml | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/action.yml b/action.yml
index 2034e26..cad64b6 100644
--- a/action.yml
+++ b/action.yml
@@ -45,12 +45,17 @@ runs:
       run: |
         ${GITHUB_ACTION_PATH}/pre_cache_action.sh \
           ~/cache-apt-pkgs \
-          "${{ inputs.version }}" \
-          "${{ inputs.execute_install_scripts }}" \
-          "${{ inputs.debug }}" \
-          ${{ inputs.packages }}
+          "$VERSION" \
+          "$EXEC_INSTALL_SCRIPTS" \
+          "$DEBUG" \
+          "$PACKAGES"
         echo "CACHE_KEY=$(cat ~/cache-apt-pkgs/cache_key.md5)" >> $GITHUB_ENV
       shell: bash
+      env:
+         VERSION: "${{ inputs.version }}"
+         EXEC_INSTALL_SCRIPTS: "${{ inputs.execute_install_scripts }}"
+         DEBUG: "${{ inputs.debug }}"
+         PACKAGES: "${{ inputs.packages }}"
 
     - id: load-cache
       uses: actions/cache@v3
@@ -63,18 +68,23 @@ runs:
         ${GITHUB_ACTION_PATH}/post_cache_action.sh \
           ~/cache-apt-pkgs \
           / \
-          "${{ steps.load-cache.outputs.cache-hit }}" \
-          "${{ inputs.execute_install_scripts }}" \
-          "${{ inputs.debug }}" \
-          ${{ inputs.packages }}
+          "$CACHE_HIT" \
+          "$EXEC_INSTALL_SCRIPTS" \
+          "$DEBUG" \
+          "$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
       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
       if: ${{ inputs.debug == 'true' }}
       uses: actions/upload-artifact@v3
       with:
-        name: cache-apt-pkgs-logs%${{ inputs.packages }}%${{ inputs.version }}
+        name: cache-apt-pkgs-logs_${{ env.CACHE_KEY }}
         path: ~/cache-apt-pkgs/*.log