Fix more problems

Author: mhucka

.github/actions/set-up-bazelisk/action.yaml

@@ -40,9 +40,9 @@ runs:
   steps:
     - name: Set environment variables
       shell: bash
-      SHELLOPTS: ${{(inputs.debug || runner.debug) && 'xtrace' || ''}}
+      env:
+        SHELLOPTS: ${{(inputs.debug || runner.debug) && 'xtrace' || ''}}
       run: |
-        echo "bazel_cache=$HOME/.cache/bazel" >> "$GITHUB_ENV"
         if [[ -n "${{inputs.bazel-version}}" ]]; then
           version="${{inputs.bazel-version}}"
         elif [[ -f ".bazelversion" ]]; then
@@ -66,12 +66,11 @@ runs:
     # shared between workflows.
     #
     # Bazel --repository_cache: stores the raw downloaded files (like .zip,
-    # .tar.gz) specified by repository rules like http_archive. This can also
-    # be shared between workflows.
+    # .tar.gz) specified by repository rules like http_archive. This can be
+    # shared between workflows.
     #
     # Bazel --disk_cache: stores the compiled outputs of build actions, such as
-    # compiled object files (.o), linked libraries (.so, .dll), binaries, & test
-    # results. This is also sharable between workflows.
+    # object files (.o), linked libraries (.so), binaries, & test results.
 
     - name: Set up cache for Bazelisk
       uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830  # v4.3.0
@@ -83,15 +82,16 @@ runs:
     - name: Set up Bazel repository cache
       uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830  # v4.3.0
       with:
-        path: ${{env.bazel-cache}}/repository_cache
+        path: ~/.cache/bazel/repository_cache
         key: bazel-repo-${{env.bazelversion}}
         restore-keys: bazel-repo-
 
     - name: Set up Bazel disk cache
       uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830  # v4.3.0
       with:
-        path: ${{env.bazel-cache}}/disk_cache
-        key: bazel-disk-${{runner.os}}-${{runner.arch}}-${{github.ref}}-${{github.sha}}
+        path: ~/.cache/bazel/disk_cache
+        # yamllint disable-line rule:line-length
+        key: bazel-disk-${{runner.os}}-${{runner.arch}}-${{github.ref}}-${{hashFiles('**/WORKSPACE', '**/BUILD', '**/BUILD.tpl', '**/*.bzl')}}
         restore-keys: bazel-disk-${{runner.os}}-${{runner.arch}}-${{github.ref}}-
 
     - name: Determine the number of processors we can use
@@ -105,11 +105,13 @@ runs:
 
     - name: Add configuration settings to .bazelrc
       shell: bash
+      env:
+        SHELLOPTS: ${{(inputs.debug || runner.debug) && 'xtrace' || ''}}
       run: |
         {
-        echo "startup --output_base=${{env.bazel-cache}}/output_base"
-        echo "build --disk_cache=${{env.bazel-cache}}/disk_cache"
-        echo "build --repository_cache=${{env.bazel-cache}}/repository_cache"
+        echo "startup --output_base=~/.cache/bazel/output_base"
+        echo "build --disk_cache=~/.cache/bazel/disk_cache"
+        echo "build --repository_cache=~/.cache/bazel/repository_cache"
         echo "build --jobs=${{env.num_cpus}}"
         echo "test --cache_test_results=no"
         } >> .bazelrc