.gitlab-ci.yml

@@ -57,6 +57,7 @@ deploy:
 
 # TODO: switch this out for `rules_semantic_release`
 semantic-release:
+  extends: .bazelisk
   stage: .post
   needs:
     - deploy

CHANGELOG.md

+# [1.0.0-beta.5](https://git.gitlab.arm.com/ci/component/bazelisk/compare/v1.0.0-beta.4...v1.0.0-beta.5) (2024-10-10)
+
+### Bug Fixes
+
+- remove need for `pushd`/`popd` ([865596c](https://git.gitlab.arm.com/ci/component/bazelisk/commit/865596c2fbad7995f1949d6f2e9c7cb89ebf7914))
+
 # [1.0.0-beta.4](https://git.gitlab.arm.com/ci/component/bazelisk/compare/v1.0.0-beta.3...v1.0.0-beta.4) (2024-08-13)
 
 ### Bug Fixes

CODEOWNERS

-* @bazel
+* @matthew.clarkson
 
 [CI components] @matthew.clarkson
 /templates/
@@ -16,6 +16,9 @@
 [CI] @matthew.clarkson
 .gitlab-ci.yml
 
+[Templates] @matthew.clarkson
+/templates/*
+
 [Release] @matthew.clarkson
 /.releaserc.yaml
 

MODULE.bazel

 module(
     name = "bazelisk",
-    version = "1.0.0-beta.4",
+    version = "1.0.0-beta.5",
     bazel_compatibility = [
         ">=7.0.0",
     ],

templates/bazelisk.yml

@@ -3,7 +3,7 @@ spec:
     image:
       default: registry.gitlab.arm.com/ci/component/bazelisk
     tag:
-      default: 1.0.0-beta.4
+      default: 1.0.0-beta.5
     stage:
       default: test
     src:
@@ -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]]"