Fix broken test

.github/workflows/ci.bazelrc

@@ -0,0 +1,7 @@
+# Bazel settings to apply on CI only
+# Included with a --bazelrc option in the call to bazel in main.yml
+build --announce_rc
+test --test_output=errors
+build --disk_cache=$HOME/.cache/bazel
+build --repository_cache=$HOME/.cache/bazel-repo
+test --test_env=XDG_CACHE_HOME

.github/workflows/main.yml

@@ -25,9 +25,18 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
       - uses: bazelbuild/setup-bazelisk@v1
-      - name: Mount bazel cache
+      - name: Mount bazel action cache
         uses: actions/cache@v2
         with:
           path: "~/.cache/bazel"
           key: bazel
-      - run: bazel test //...
+      - name: Mount bazel repo cache
+        uses: actions/cache@v2
+        with:
+          path: "~/.cache/bazel-repo"
+          key: bazel-repo
+      - name: bazel test //...
+        env:
+          # Bazelisk will download bazel to here
+          XDG_CACHE_HOME: ~/.cache/bazel-repo
+        run: bazel --bazelrc=.github/workflows/ci.bazelrc --bazelrc=.bazelrc test //...

test/version_test.sh

@@ -5,7 +5,7 @@ set -o pipefail -o errexit -o nounset
 ASPECT="$TEST_SRCDIR/build_aspect_cli/cmd/aspect/aspect_/aspect"
 
 # Only capture stdout, just like `bazel version` prints to stdout
-ver=$($ASPECT version 2>/dev/null)
+ver=$($ASPECT version 2>/dev/null) || "$ASPECT" version
 
 # Should print our own version
 [[ "$ver" =~ "Aspect version:" ]] || {