Skip to content

Commit 4ed7b7e

Browse files
authored
Merge pull request #93 from sbt/wip/jdk
fix: Include JDK version in the cache key
2 parents f129e4b + 8ca4584 commit 4ed7b7e

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ runs:
1919
SBT_RUNNER_VERSION: ${{ inputs.sbt-runner-version }}
2020
SBT_CACHE_KEY_VERSION: 1.1.25
2121
run: |
22+
JDK_VERSION=0
23+
if [[ -x "$(command -v java)" ]]; then
24+
JDK_VERSION=$(java -version 2>&1 | head -n 1 | sed -e 's/.*"\(.*\)"\(.*\)/\1/; 1q')
25+
fi
2226
if [[ "$RUNNER_OS" == "Windows" ]]; then
2327
echo "sbt_toolpath=$RUNNER_TOOL_CACHE\\sbt\\$SBT_RUNNER_VERSION" >> "$GITHUB_OUTPUT"
2428
echo "sbt_downloadpath=$RUNNER_TEMP\\_sbt" >> "$GITHUB_OUTPUT"
@@ -33,7 +37,7 @@ runs:
3337
echo "sbt_diskcache=$HOME/.cache/sbt" >> "$GITHUB_OUTPUT"
3438
fi
3539
echo "sbt_cachekey=$RUNNER_OS-sbt-$SBT_RUNNER_VERSION-$SBT_CACHE_KEY_VERSION" >> "$GITHUB_OUTPUT"
36-
echo "sbt_diskcachekey=$RUNNER_OS-sbt-diskcache-$SBT_CACHE_KEY_VERSION" >> "$GITHUB_OUTPUT"
40+
echo "sbt_diskcachekey=$RUNNER_OS-java$JDK_VERSION-sbt-diskcache-$SBT_CACHE_KEY_VERSION" >> "$GITHUB_OUTPUT"
3741
- name: Check Tool Cache
3842
id: cache-tool-dir
3943
shell: bash

0 commit comments

Comments
 (0)