Fixing cirque runner

project-chip · Jul 11, 2023 · dd124a0 · dd124a0
1 parent 4813678
commit dd124a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -59,7 +59,7 @@ jobs:
 
             - name: Bootstrap Cache
               uses: ./.github/actions/bootstrap-cache
-            - name: Bootstrap
+            - name: Bootstrap Cirque
               run: |
                   integrations/docker/images/stage-2/chip-build-cirque/run.sh \
                     -- sh -c " \

diff --git a/scripts/tests/cirque_tests.sh b/scripts/tests/cirque_tests.sh
@@ -116,10 +116,7 @@ function cirquetest_bootstrap() {
 
     make NO_GRPC=1 install -j
 
-    if [[ "$GITHUB_ACTION_RUN" = "1" ]]; then
-        # Note: This script will be invoked in docker on CI, We should add CHIP repo to safe directory to silent git error messages.
-        git config --global --add safe.directory /home/runner/work/connectedhomeip/connectedhomeip
-    fi
+    git config --global --add safe.directory /home/runner/work/connectedhomeip/connectedhomeip
 
     "$REPO_DIR"/integrations/docker/ci-only-images/chip-cirque-device-base/build.sh
 
@@ -189,12 +186,12 @@ subcommand=$1
 shift
 
 case $subcommand in
-    *)
-        cirquetest_"$subcommand" "$@"
-        exitcode=$?
-        if ((exitcode == 127)); then
-            echo "Unknown command: $subcommand" >&2
-        fi
-        exit "$exitcode"
-        ;;
+*)
+    cirquetest_"$subcommand" "$@"
+    exitcode=$?
+    if ((exitcode == 127)); then
+        echo "Unknown command: $subcommand" >&2
+    fi
+    exit "$exitcode"
+    ;;
 esac