From 8255d8b3cebdf951a6fb5f2477b65f3a1137dbf0 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Sun, 3 Mar 2024 20:56:19 +1300 Subject: [PATCH] fix(ci): exclude godot-cpp and libtsm from cache The godot-cpp and libtsm dependecies are built via the SConstruct file and therefore can be handled by the SCons cache. By caching the seperately, changes to the submodules were being overwritten. --- .github/actions/cache-submodules/action.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/cache-submodules/action.yml b/.github/actions/cache-submodules/action.yml index cee587a..eabea4c 100644 --- a/.github/actions/cache-submodules/action.yml +++ b/.github/actions/cache-submodules/action.yml @@ -17,11 +17,10 @@ runs: working-directory: addons/godot_xterm/native/thirdparty shell: bash run: | - godot_cpp_rev=$(git ls-tree HEAD godot-cpp --object-only) libuv_rev=$(git ls-tree HEAD libuv --object-only) - libtsm_rev=$(git ls-tree HEAD libtsm --object-only) + node_pty_rev=$(git ls-tree HEAD node-pty --object-only) hash_cmd=$([[ $RUNNER_OS == 'Windows' ]] && echo 'sha1sum' || echo 'shasum') - hash_of_hashes=$(echo -n "$godot_cpp_rev$libuv_rev$libtsm_rev" | $hash_cmd | head -c 40) + hash_of_hashes=$(echo -n "$libuv_rev$node_pty_rev" | $hash_cmd | head -c 40) echo "hash=$hash_of_hashes" >> $GITHUB_OUTPUT build_files_hash=${{ hashFiles('**/build.sh', '**/*.Dockerfile', '**/SConstruct', '**/*.yml') }} echo "build-files-hash=$build_files_hash" >> $GITHUB_OUTPUT