chore: upgrade bazel-lib in e2e tests for windows fix (#704)

aspect-build · Sep 24, 2024 · 4a4bf96 · 4a4bf96
1 parent 6596a65
commit 4a4bf96
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 0 deletions.
diff --git a/e2e/external_dep/MODULE.bazel b/e2e/external_dep/MODULE.bazel
@@ -4,6 +4,12 @@ local_path_override(
     path = "../..",
 )
 
+# Override the version declared by rules_ts for windows fix
+single_version_override(
+    module_name = "aspect_bazel_lib",
+    version = "2.9.0",
+)
+
 # TODO: rules_js shouldn't be required in this module, as we don't reference it anywhere.
 # However, on RBE only (!) we get an error:
 # ERROR: /home/runner/work/rules_ts/rules_ts/e2e/external_dep/app/BUILD:4:11:

diff --git a/e2e/external_dep/WORKSPACE b/e2e/external_dep/WORKSPACE
@@ -1,8 +1,18 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 local_repository(
     name = "aspect_rules_ts",
     path = "../..",
 )
 
+# Override the version declared by rules_ts for windows fix
+http_archive(
+    name = "aspect_bazel_lib",
+    sha256 = "da67c6a785cdc10faf960a22c44501fe6be357a6ebd2bd6101560f9c2a9e06b3",
+    strip_prefix = "bazel-lib-2.9.0",
+    url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.9.0/bazel-lib-v2.9.0.tar.gz",
+)
+
 load("@aspect_rules_ts//ts:repositories.bzl", "LATEST_TYPESCRIPT_VERSION", "rules_ts_dependencies")
 
 rules_ts_dependencies(ts_version = LATEST_TYPESCRIPT_VERSION)

diff --git a/e2e/external_dep/app/MODULE.bazel b/e2e/external_dep/app/MODULE.bazel
@@ -4,6 +4,12 @@ local_path_override(
     path = "../../..",
 )
 
+# Override the version declared by rules_ts for windows fix
+single_version_override(
+    module_name = "aspect_bazel_lib",
+    version = "2.9.0",
+)
+
 # TODO: see note on rules_js in the parent MODULE.bazel
 bazel_dep(name = "aspect_rules_js", version = "2.0.0", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)

diff --git a/e2e/external_dep/app/WORKSPACE b/e2e/external_dep/app/WORKSPACE
@@ -1,3 +1,5 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 local_repository(
     name = "aspect_rules_ts",
     path = "../../..",
@@ -8,6 +10,14 @@ local_repository(
     path = "..",
 )
 
+# Override the version declared by rules_ts for windows fix
+http_archive(
+    name = "aspect_bazel_lib",
+    sha256 = "da67c6a785cdc10faf960a22c44501fe6be357a6ebd2bd6101560f9c2a9e06b3",
+    strip_prefix = "bazel-lib-2.9.0",
+    url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.9.0/bazel-lib-v2.9.0.tar.gz",
+)
+
 load("@aspect_rules_ts//ts:repositories.bzl", "LATEST_TYPESCRIPT_VERSION", "rules_ts_dependencies")
 
 rules_ts_dependencies(ts_version = LATEST_TYPESCRIPT_VERSION)

diff --git a/e2e/workspace/WORKSPACE b/e2e/workspace/WORKSPACE
@@ -1,9 +1,19 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 # Override http_archive for local testing
 local_repository(
     name = "aspect_rules_ts",
     path = "../..",
 )
 
+# Override the version declared by rules_ts for windows fix
+http_archive(
+    name = "aspect_bazel_lib",
+    sha256 = "da67c6a785cdc10faf960a22c44501fe6be357a6ebd2bd6101560f9c2a9e06b3",
+    strip_prefix = "bazel-lib-2.9.0",
+    url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.9.0/bazel-lib-v2.9.0.tar.gz",
+)
+
 #---SNIP--- Below here is re-used in the workspace snippet published on releases
 
 ##################