diff --git a/.github/workflows/build_bromite.yaml b/.github/workflows/build_bromite.yaml
index 788a3b6..b3ae5b7 100644
--- a/.github/workflows/build_bromite.yaml
+++ b/.github/workflows/build_bromite.yaml
@@ -230,8 +230,7 @@ jobs:
              [[ "${{ inputs.usegoma }}" = true ]] && \
                 gn gen --args="import(\"/home/lg/working_dir/bromite/build/GN_ARGS\") use_goma=true goma_dir=\"$WORKSPACE/goma\" $(cat ../../build_args.gni) " out/bromite \
                 || \
-                gn gen --args="import(\"/home/lg/working_dir/bromite/build/GN_ARGS\") $(cat ../../build_args.gni) " out/bromite \
-                
+                gn gen --args="import(\"/home/lg/working_dir/bromite/build/GN_ARGS\") $(cat ../../build_args.gni) " out/bromite              
              echo "::endgroup::"
 
              echo "::group::-------- gn args"
@@ -251,17 +250,17 @@ jobs:
               GOMAJOBS=40
           fi
 
+          echo "::group::-------- pre-cache toolchain"
           [[ "${{ inputs.usegoma }}" = true ]] && \
-            echo "::group::-------- pre-cache toolchain" && \
             sudo ../../casupload --cas-server=unix:/tmp/proxy/bots.sock --instance=default_instance \
                     third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include \
                     third_party/android_ndk/toolchains/llvm/prebuilt/linux-x86_64/include \
                     third_party/llvm-build/Release+Asserts/lib \
                     third_party/llvm-build/Release+Asserts/bin \
                     buildtools/third_party/libc++ \
-              chrome/android/profiles/afdo.prof && \
-            echo "::endgroup::"
+              chrome/android/profiles/afdo.prof \
             || true
+          echo "::endgroup::"
 
       - name: Build Bromite
         shell: bash
@@ -272,7 +271,7 @@ jobs:
           [[ "${{ inputs.usegoma }}" = true ]] && \
             autoninja -j $GOMAJOBS -C out/bromite chrome_public_apk \
             || \
-            autoninja -C out/bromite chrome_public_apk ||
+            autoninja -C out/bromite chrome_public_apk
 
       - name: Get goma logs
         shell: bash