remove: test against bazel-lib 1.x

aspect-build · Nov 16, 2023 · 4be05f9 · 4be05f9
1 parent defe84b
commit 4be05f9
Show file tree

Hide file tree

Showing 32 changed files with 254 additions and 3 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -14,6 +14,14 @@ bazel_dep(name = "bazel_skylib", version = "1.4.1")
 bazel_dep(name = "rules_nodejs", version = "5.8.2")
 bazel_dep(name = "platforms", version = "0.0.5")
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    patches = ["//:version.patch"],
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 use_repo(node, "nodejs_linux_amd64")
 use_repo(node, "nodejs_darwin_arm64")

diff --git a/e2e/bzlmod/MODULE.bazel b/e2e/bzlmod/MODULE.bazel
@@ -13,6 +13,14 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    patches = ["//:version.patch"],
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension(
     "@aspect_rules_js//npm:extensions.bzl",
     "npm",

diff --git a/e2e/bzlmod/version.patch b/e2e/bzlmod/version.patch
@@ -0,0 +1,12 @@
+diff --git tools/version.bzl tools/version.bzl
+index 6967419..08cc97e 100644
+--- tools/version.bzl
++++ tools/version.bzl
+@@ -2,6 +2,6 @@
+
+ # This is automagically replace by git during git archive using `git export-subst`
+ # See https://git-scm.com/docs/git-archive/2.29.0#Documentation/git-archive.txt-export-subst
+-_VERSION_PRIVATE = "$Format:%(describe:tags=true)$"
++_VERSION_PRIVATE = "v1.37.0"
+
+ VERSION = "0.0.0" if _VERSION_PRIVATE.startswith("$Format") else _VERSION_PRIVATE.replace("v", "", 1)
diff --git a/e2e/gyp_no_install_script/MODULE.bazel b/e2e/gyp_no_install_script/MODULE.bazel
@@ -1,3 +1,12 @@
+# TODO: remove before landing
+bazel_dep(name = "aspect_bazel_lib", version = "0.0.0")
+archive_override(
+    module_name = "aspect_bazel_lib",
+    patches = ["//:version.patch"],
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 bazel_dep(name = "aspect_rules_js", version = "0.0.0")
 local_path_override(
     module_name = "aspect_rules_js",

diff --git a/e2e/gyp_no_install_script/version.patch b/e2e/gyp_no_install_script/version.patch
@@ -0,0 +1,12 @@
+diff --git tools/version.bzl tools/version.bzl
+index 6967419..08cc97e 100644
+--- tools/version.bzl
++++ tools/version.bzl
+@@ -2,6 +2,6 @@
+
+ # This is automagically replace by git during git archive using `git export-subst`
+ # See https://git-scm.com/docs/git-archive/2.29.0#Documentation/git-archive.txt-export-subst
+-_VERSION_PRIVATE = "$Format:%(describe:tags=true)$"
++_VERSION_PRIVATE = "v1.37.0"
+
+ VERSION = "0.0.0" if _VERSION_PRIVATE.startswith("$Format") else _VERSION_PRIVATE.replace("v", "", 1)
diff --git a/e2e/js_image_oci/WORKSPACE b/e2e/js_image_oci/WORKSPACE
@@ -5,6 +5,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 ###
 # Setup rules_js
 ###
+
 local_repository(
     name = "aspect_rules_js",
     path = "../..",

diff --git a/e2e/js_run_devserver/MODULE.bazel b/e2e/js_run_devserver/MODULE.bazel
@@ -13,6 +13,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
 use_repo(pnpm, "pnpm")
 

diff --git a/e2e/js_run_devserver/version.patch b/e2e/js_run_devserver/version.patch
@@ -0,0 +1,12 @@
+diff --git tools/version.bzl tools/version.bzl
+index 6967419..08cc97e 100644
+--- tools/version.bzl
++++ tools/version.bzl
+@@ -2,6 +2,6 @@
+
+ # This is automagically replace by git during git archive using `git export-subst`
+ # See https://git-scm.com/docs/git-archive/2.29.0#Documentation/git-archive.txt-export-subst
+-_VERSION_PRIVATE = "$Format:%(describe:tags=true)$"
++_VERSION_PRIVATE = "v1.37.0"
+
+ VERSION = "0.0.0" if _VERSION_PRIVATE.startswith("$Format") else _VERSION_PRIVATE.replace("v", "", 1)
diff --git a/e2e/npm_translate_lock/MODULE.bazel b/e2e/npm_translate_lock/MODULE.bazel
@@ -12,6 +12,14 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    patches = ["//:version.patch"],
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/npm_translate_lock/version.patch b/e2e/npm_translate_lock/version.patch
@@ -0,0 +1,12 @@
+diff --git tools/version.bzl tools/version.bzl
+index 6967419..08cc97e 100644
+--- tools/version.bzl
++++ tools/version.bzl
+@@ -2,6 +2,6 @@
+
+ # This is automagically replace by git during git archive using `git export-subst`
+ # See https://git-scm.com/docs/git-archive/2.29.0#Documentation/git-archive.txt-export-subst
+-_VERSION_PRIVATE = "$Format:%(describe:tags=true)$"
++_VERSION_PRIVATE = "v1.37.0"
+
+ VERSION = "0.0.0" if _VERSION_PRIVATE.startswith("$Format") else _VERSION_PRIVATE.replace("v", "", 1)
diff --git a/e2e/npm_translate_lock_empty/MODULE.bazel b/e2e/npm_translate_lock_empty/MODULE.bazel
@@ -12,6 +12,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/npm_translate_lock_multi/MODULE.bazel b/e2e/npm_translate_lock_multi/MODULE.bazel
@@ -11,6 +11,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "app1_npm",

diff --git a/e2e/npm_translate_lock_partial_clone/MODULE.bazel b/e2e/npm_translate_lock_partial_clone/MODULE.bazel
@@ -12,6 +12,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/npm_translate_lock_subdir_patch/MODULE.bazel b/e2e/npm_translate_lock_subdir_patch/MODULE.bazel
@@ -4,6 +4,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/npm_translate_package_lock/MODULE.bazel b/e2e/npm_translate_package_lock/MODULE.bazel
@@ -11,6 +11,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/npm_translate_yarn_lock/MODULE.bazel b/e2e/npm_translate_yarn_lock/MODULE.bazel
@@ -11,6 +11,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/package_json_module/MODULE.bazel b/e2e/package_json_module/MODULE.bazel
@@ -10,6 +10,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/patch_from_repo/MODULE.bazel b/e2e/patch_from_repo/MODULE.bazel
@@ -7,6 +7,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 local_path_override(
     module_name = "local_repo",
     path = "./local_repo",

diff --git a/e2e/pnpm_repo_install/MODULE.bazel b/e2e/pnpm_repo_install/MODULE.bazel
@@ -11,6 +11,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 use_repo(node, "nodejs_toolchains")
 use_repo(node, "nodejs_linux_amd64")

diff --git a/e2e/pnpm_workspace/MODULE.bazel b/e2e/pnpm_workspace/MODULE.bazel
@@ -13,6 +13,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 use_repo(node, "nodejs_toolchains")
 use_repo(node, "nodejs_linux_amd64")

diff --git a/e2e/pnpm_workspace_deps/MODULE.bazel b/e2e/pnpm_workspace_deps/MODULE.bazel
@@ -10,6 +10,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/pnpm_workspace_rerooted/MODULE.bazel b/e2e/pnpm_workspace_rerooted/MODULE.bazel
@@ -11,6 +11,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(
     name = "nodejs",

diff --git a/e2e/update_pnpm_lock/MODULE.bazel b/e2e/update_pnpm_lock/MODULE.bazel
@@ -11,6 +11,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/update_pnpm_lock_with_import/MODULE.bazel b/e2e/update_pnpm_lock_with_import/MODULE.bazel
@@ -11,6 +11,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 
 # Validate that we can use a yarn.lock file in place of pnpm-lock.yaml

diff --git a/e2e/vendored_node/MODULE.bazel b/e2e/vendored_node/MODULE.bazel
@@ -13,4 +13,11 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 register_toolchains("//toolchains:all")
diff --git a/e2e/vendored_tarfile/MODULE.bazel b/e2e/vendored_tarfile/MODULE.bazel
@@ -11,6 +11,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/verify_patches/MODULE.bazel b/e2e/verify_patches/MODULE.bazel
@@ -11,6 +11,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/webpack_devserver/MODULE.bazel b/e2e/webpack_devserver/MODULE.bazel
@@ -6,6 +6,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/webpack_devserver_esm/MODULE.bazel b/e2e/webpack_devserver_esm/MODULE.bazel
@@ -6,6 +6,13 @@ local_path_override(
     path = "../..",
 )
 
+# TODO: remove before landing
+archive_override(
+    module_name = "aspect_bazel_lib",
+    strip_prefix = "bazel-lib-a72c63ea8296c9f8377866440f52083aeb31022f",
+    urls = ["https://github.com/kormide/bazel-lib/archive/a72c63ea8296c9f8377866440f52083aeb31022f.zip"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",