Bump cache

Signed-off-by: Michael Carroll <michael@openrobotics.org>

.github/actions/bazel-ci-jammy/run.sh

@@ -4,7 +4,7 @@ set -x
 set -e
 
 BAZEL_ARGS=$1
-WORKSPACE=$GITHUB_WORKSPACE/gz
+WORKSPACE=~/gz
 BAZEL_CACHE=$GITHUB_WORKSPACE/bazel_cache
 BAZEL=~/.cache/bazelisk-linux-amd64
 
@@ -34,6 +34,7 @@ echo ::endgroup::
 if [ ! -d "$BAZEL_CACHE" ]; then
   mkdir -p ${BAZEL_CACHE}
 fi
+rm -rf ~/.cache
 ln -sf ${BAZEL_CACHE} ~/.cache
 
 # Install baselisk if it is not already installed
@@ -47,7 +48,7 @@ mkdir -p ${WORKSPACE}/bazel
 cd ${WORKSPACE}
 shopt -s extglob
 # Copy relevant bazel files into the build space
-cp -R ${GITHUB_WORKSPACE}/!(gz|.git|.github) ${WORKSPACE}/bazel
+cp -R ${GITHUB_WORKSPACE}/!(gz|.git|.github|bazel_cache) ${WORKSPACE}/bazel
 vcs import . < ${WORKSPACE}/bazel/example/bazel.repos
 
 echo ::group::Install dependencies from binaries
@@ -74,3 +75,11 @@ echo ::endgroup::
 echo ::group::Bazel test
 ${BAZEL} test $BAZEL_ARGS
 echo ::endgroup::
+
+echo ::group::Bazel test
+ls -la ${WORKSPACE}
+ls -la ${WORKSPACE}/bazel-testlogs
+ls -la ${BAZEL_CACHE}
+echo ::endgroup::
+
+cp -RL ${WORKSPACE}/bazel-testlogs ${GITHUB_WORKSPACE}/bazel-testlogs

.github/workflows/ci.yml

@@ -11,13 +11,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Login to GHCR
-        run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Cache bazel
         uses: actions/cache@v3
         env:
-          cache-name: bazel-cache-1
+          cache-name: bazel-cache-3
         with:
           path: |
             ${{ github.workspace }}/bazel_cache
@@ -32,5 +36,5 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: bazel-testlogs
-          path: ${{ github.workspace }}/gz/bazel-testlogs
+          path: ${{ github.workspace }}/bazel-testlogs
           retention-days: 5