From c8b787a22b6a93ea755bccc4565a6b2b465b5ec1 Mon Sep 17 00:00:00 2001
From: helly25 <6420169+helly25@users.noreply.github.com>
Date: Sun, 18 Oct 2026 14:15:48 +0100
Subject: [PATCH 1/2] Use bzl 0.8.0 runfiles keys for test tools

Signed-off-by: helly25 <6420169+helly25@users.noreply.github.com>
---
 CHANGELOG.md                             | 2 ++
 MODULE.bazel                             | 9 +++++++++
 bashtest/BUILD.bazel                     | 1 +
 bashtest/tests/external_consumer_test.sh | 7 +++++++
 bashtest/tests/tools_consumer_test.sh    | 7 +++++++
 bashtest/tools.bzl                       | 9 +++------
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7818b3..87e8835 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # 0.7.1
 
+* Use mboworks_bzl 0.8.0 runfiles keys for helper executables and tool manifests.
+
 * Derive consumer fixture versions from the module and automate the README
   version update during release preparation. Test development/release version
   consistency and post-release version bumps.
diff --git a/MODULE.bazel b/MODULE.bazel
index 04f8bd8..30742d4 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -21,6 +21,7 @@ module(
 )
 
 bazel_dep(name = "bazel_skylib", version = "1.9.2")
+bazel_dep(name = "mboworks_bzl", version = "0.8.0")
 bazel_dep(name = "platforms", version = "1.1.0")
 bazel_dep(name = "rules_shell", version = "0.8.0")
 
@@ -29,3 +30,11 @@ windows_runtime = use_repo_rule("//bashtest/runtime:repositories.bzl", "windows_
 windows_runtime(name = "bashtest_windows_runtime")
 
 register_toolchains("//bashtest/runtime:windows_toolchain")
+
+# Temporary until mboworks_bzl 0.8.0 is published; then remove this override.
+archive_override(
+    module_name = "mboworks_bzl",
+    integrity = "sha256-qDdtBpEZVlxbJCHfW2hXR3GFOS5diYVVIZuWM5p64TI=",
+    strip_prefix = "bzl-afcd7e0279f6791880750dfbccd97c047ad51e96",
+    urls = ["https://github.com/mboworks/bzl/archive/afcd7e0279f6791880750dfbccd97c047ad51e96.tar.gz"],
+)
diff --git a/bashtest/BUILD.bazel b/bashtest/BUILD.bazel
index a871cc6..cb98a0a 100644
--- a/bashtest/BUILD.bazel
+++ b/bashtest/BUILD.bazel
@@ -25,6 +25,7 @@ bzl_library(
         "tools.bzl",
         "windows.bzl",
     ],
+    deps = ["@mboworks_bzl//bzl/runfiles"],
 )
 
 sh_library(
diff --git a/bashtest/tests/external_consumer_test.sh b/bashtest/tests/external_consumer_test.sh
index 07c816b..1babbf3 100755
--- a/bashtest/tests/external_consumer_test.sh
+++ b/bashtest/tests/external_consumer_test.sh
@@ -38,6 +38,13 @@ cat > MODULE.bazel <<EOF
 module(name = "consumer")
 bazel_dep(name = "mboworks_bashtest", version = "${version}", repo_name = "framework")
 local_path_override(module_name = "mboworks_bashtest", path = "${repo}")
+# Temporary until mboworks_bzl 0.8.0 is published; then remove this override.
+archive_override(
+    module_name = "mboworks_bzl",
+    integrity = "sha256-qDdtBpEZVlxbJCHfW2hXR3GFOS5diYVVIZuWM5p64TI=",
+    strip_prefix = "bzl-afcd7e0279f6791880750dfbccd97c047ad51e96",
+    urls = ["https://github.com/mboworks/bzl/archive/afcd7e0279f6791880750dfbccd97c047ad51e96.tar.gz"],
+)
 EOF
 cat > BUILD.bazel <<'EOF'
 load("@framework//bashtest:bashtest.bzl", "bashtest")
diff --git a/bashtest/tests/tools_consumer_test.sh b/bashtest/tests/tools_consumer_test.sh
index 3379792..ef472c6 100755
--- a/bashtest/tests/tools_consumer_test.sh
+++ b/bashtest/tests/tools_consumer_test.sh
@@ -38,6 +38,13 @@ cat > MODULE.bazel <<EOF
 module(name = "tools_consumer")
 bazel_dep(name = "mboworks_bashtest", version = "${version}", repo_name = "framework")
 local_path_override(module_name = "mboworks_bashtest", path = "${repo}")
+# Temporary until mboworks_bzl 0.8.0 is published; then remove this override.
+archive_override(
+    module_name = "mboworks_bzl",
+    integrity = "sha256-qDdtBpEZVlxbJCHfW2hXR3GFOS5diYVVIZuWM5p64TI=",
+    strip_prefix = "bzl-afcd7e0279f6791880750dfbccd97c047ad51e96",
+    urls = ["https://github.com/mboworks/bzl/archive/afcd7e0279f6791880750dfbccd97c047ad51e96.tar.gz"],
+)
 bazel_dep(name = "rules_shell", version = "0.8.0")
 bazel_dep(name = "platforms", version = "1.1.0")
 EOF
diff --git a/bashtest/tools.bzl b/bashtest/tools.bzl
index 31d4fcb..ad86cec 100644
--- a/bashtest/tools.bzl
+++ b/bashtest/tools.bzl
@@ -15,10 +15,7 @@
 
 """Bind helper executables to the execution platform of the actual test action."""
 
-def _rlocation_path(ctx, file):
-    if file.short_path.startswith("../"):
-        return file.short_path[3:]
-    return ctx.workspace_name + "/" + file.short_path
+load("@mboworks_bzl//bzl/runfiles:runfiles.bzl", _runfiles = "runfiles")
 
 def _validate_name(name):
     letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_"
@@ -54,7 +51,7 @@ def _tools_test_impl(ctx):
             if name in names or name in environment.environment or name in environment.inherited_environment:
                 fail("tool environment variable is already defined: " + name)
             names.append(name)
-            entries.append(name + "\t" + _rlocation_path(ctx, executable) + "\n")
+            entries.append(name + "\t" + _runfiles.key(ctx, executable) + "\n")
         tool_files.append(executable)
         tool_runfiles.extend([info.default_runfiles, info.data_runfiles])
     manifest = ctx.actions.declare_file(ctx.label.name + ".tools")
@@ -68,7 +65,7 @@ def _tools_test_impl(ctx):
     return [
         DefaultInfo(executable = executable, runfiles = runfiles),
         RunEnvironmentInfo(
-            environment = environment.environment | ({"_BASHTEST_TOOLS_MANIFEST": _rlocation_path(ctx, manifest)} if ctx.attr.tools else {}),
+            environment = environment.environment | ({"_BASHTEST_TOOLS_MANIFEST": _runfiles.key(ctx, manifest)} if ctx.attr.tools else {}),
             inherited_environment = environment.inherited_environment,
         ),
         coverage_common.instrumented_files_info(ctx, dependency_attributes = ["runner"]),

From b195868a260e21695e12cfdb4a42c5dd904b1a0c Mon Sep 17 00:00:00 2001
From: helly25 <6420169+helly25@users.noreply.github.com>
Date: Sun, 18 Oct 2026 20:41:27 +0100
Subject: [PATCH 2/2] Use bzl 0.8.0 from BCR without temporary overrides

Signed-off-by: helly25 <6420169+helly25@users.noreply.github.com>
---
 MODULE.bazel                             | 8 --------
 bashtest/tests/external_consumer_test.sh | 7 -------
 bashtest/tests/tools_consumer_test.sh    | 7 -------
 3 files changed, 22 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 30742d4..ebfea69 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -30,11 +30,3 @@ windows_runtime = use_repo_rule("//bashtest/runtime:repositories.bzl", "windows_
 windows_runtime(name = "bashtest_windows_runtime")
 
 register_toolchains("//bashtest/runtime:windows_toolchain")
-
-# Temporary until mboworks_bzl 0.8.0 is published; then remove this override.
-archive_override(
-    module_name = "mboworks_bzl",
-    integrity = "sha256-qDdtBpEZVlxbJCHfW2hXR3GFOS5diYVVIZuWM5p64TI=",
-    strip_prefix = "bzl-afcd7e0279f6791880750dfbccd97c047ad51e96",
-    urls = ["https://github.com/mboworks/bzl/archive/afcd7e0279f6791880750dfbccd97c047ad51e96.tar.gz"],
-)
diff --git a/bashtest/tests/external_consumer_test.sh b/bashtest/tests/external_consumer_test.sh
index 1babbf3..07c816b 100755
--- a/bashtest/tests/external_consumer_test.sh
+++ b/bashtest/tests/external_consumer_test.sh
@@ -38,13 +38,6 @@ cat > MODULE.bazel <<EOF
 module(name = "consumer")
 bazel_dep(name = "mboworks_bashtest", version = "${version}", repo_name = "framework")
 local_path_override(module_name = "mboworks_bashtest", path = "${repo}")
-# Temporary until mboworks_bzl 0.8.0 is published; then remove this override.
-archive_override(
-    module_name = "mboworks_bzl",
-    integrity = "sha256-qDdtBpEZVlxbJCHfW2hXR3GFOS5diYVVIZuWM5p64TI=",
-    strip_prefix = "bzl-afcd7e0279f6791880750dfbccd97c047ad51e96",
-    urls = ["https://github.com/mboworks/bzl/archive/afcd7e0279f6791880750dfbccd97c047ad51e96.tar.gz"],
-)
 EOF
 cat > BUILD.bazel <<'EOF'
 load("@framework//bashtest:bashtest.bzl", "bashtest")
diff --git a/bashtest/tests/tools_consumer_test.sh b/bashtest/tests/tools_consumer_test.sh
index ef472c6..3379792 100755
--- a/bashtest/tests/tools_consumer_test.sh
+++ b/bashtest/tests/tools_consumer_test.sh
@@ -38,13 +38,6 @@ cat > MODULE.bazel <<EOF
 module(name = "tools_consumer")
 bazel_dep(name = "mboworks_bashtest", version = "${version}", repo_name = "framework")
 local_path_override(module_name = "mboworks_bashtest", path = "${repo}")
-# Temporary until mboworks_bzl 0.8.0 is published; then remove this override.
-archive_override(
-    module_name = "mboworks_bzl",
-    integrity = "sha256-qDdtBpEZVlxbJCHfW2hXR3GFOS5diYVVIZuWM5p64TI=",
-    strip_prefix = "bzl-afcd7e0279f6791880750dfbccd97c047ad51e96",
-    urls = ["https://github.com/mboworks/bzl/archive/afcd7e0279f6791880750dfbccd97c047ad51e96.tar.gz"],
-)
 bazel_dep(name = "rules_shell", version = "0.8.0")
 bazel_dep(name = "platforms", version = "1.1.0")
 EOF