From 865596c2fbad7995f1949d6f2e9c7cb89ebf7914 Mon Sep 17 00:00:00 2001
From: Matt Clarkson <matthew.clarkson@arm.com>
Date: Thu, 10 Oct 2024 11:31:03 +0100
Subject: [PATCH] fix: remove need for `pushd`/`popd`

Not available in some Shells.
---
 templates/bazelisk.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/templates/bazelisk.yml b/templates/bazelisk.yml
index 33260c1..bd770f7 100644
--- a/templates/bazelisk.yml
+++ b/templates/bazelisk.yml
@@ -27,7 +27,6 @@ spec:
 ---
 .bazelisk-fragment:
   rc:
-    - pushd "${ROOT}"
     - |
       # Copying Bazel run commands
       set -euo pipefail
@@ -36,30 +35,24 @@ spec:
         for VARIABLE in ${VARIABLES}; do
             LINE="${LINE//\$\{${VARIABLE}\}/${!VARIABLE}}"
         done
-        printf '%s\n' "${LINE}" >> "$[[inputs.dst]]"
-      done < "$[[inputs.src]]"
-    - popd
+        printf '%s\n' "${LINE}" >> "${ROOT}/$[[inputs.dst]]"
+      done < "${ROOT}/$[[inputs.src]]"
   execute:
-    - pushd "${ROOT}"
-    - >
-      "$[[inputs.bazelisk]]" "$[[inputs.command]]" "$[[inputs.target]]"
-    - popd
+    - cd "${ROOT}"; "$[[inputs.bazelisk]]" "$[[inputs.command]]" "$[[inputs.target]]"
   testlogs: # https://gitlab.com/gitlab-org/gitlab/-/issues/19746
     - |
       # Copying test logs to workaround gitlab#19746
       set -euo pipefail
-      pushd "${ROOT}"
       shopt -s extglob globstar nullglob
-      for SRC in bazel-testlogs/**/test.@(xml|log); do
-          DST="bazel-testlogs~/${SRC#bazel-testlogs}"
+      for SRC in "${ROOT}/bazel-testlogs/"**"/test."@(xml|log); do
+          DST="${DST}/bazel-testlogs~/${SRC#bazel-testlogs}"
           mkdir -p "${DST%/*}"
           cp "${SRC}" "${DST}"
       done
-      if test -d bazel-testlogs~; then
-          rm bazel-testlogs
-          mv bazel-testlogs{~,}
+      if test -d "${ROOT}/bazel-testlogs~"; then
+          rm "${ROOT}/bazel-testlogs"
+          mv "${ROOT}/bazel-testlogs"{~,}
       fi
-      popd
 
 .bazelisk:
   image: "$[[inputs.image]]:$[[inputs.tag]]"
-- 
GitLab