Fix bazel php target name clash with monolith (#134)

googleapis · Feb 26, 2021 · 8ef53db · 8ef53db
1 parent 0a496ea
commit 8ef53db
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/repositories.bzl b/repositories.bzl
@@ -26,7 +26,7 @@ def gapic_generator_php_repositories():
     )
     maybe(
         php,
-        name = "php",
+        name = "php_micro",
         prebuilt_phps = ["@gapic_generator_php//:rules_php_gapic/resources/php-7.4.15_linux_x86_64.tar.gz"],
         urls = ["https://www.php.net/distributions/php-7.4.15.tar.gz"],
         strip_prefix = "php-7.4.15",

diff --git a/rules_php_gapic/php.bzl b/rules_php_gapic/php.bzl
@@ -75,7 +75,7 @@ cd "$(dirname $0)/run.sh.runfiles/$(basename $WD)/{out_short_path}/install"
 php_binary = rule(
     implementation = _php_binary_impl,
     attrs = {
-        "php": attr.label(default=Label("@php//:bin/php"), allow_single_file=True, executable=True, cfg="host"),
+        "php": attr.label(default=Label("@php_micro//:bin/php"), allow_single_file=True, executable=True, cfg="host"),
         "php_composer_install": attr.label(allow_single_file=True),
         "entry_point": attr.label(allow_single_file=True),
         "working_directory_flag_name": attr.string(),

diff --git a/rules_php_gapic/php_repo.bzl b/rules_php_gapic/php_repo.bzl
@@ -115,7 +115,7 @@ def _php_composer_install_impl(ctx):
 php_composer_install = repository_rule(
     implementation = _php_composer_install_impl,
     attrs = {
-        "php": attr.label(default=Label("@php//:bin/php"), allow_single_file=True, executable=True, cfg="host"),
+        "php": attr.label(default=Label("@php_micro//:bin/php"), allow_single_file=True, executable=True, cfg="host"),
         "composer_phar": attr.label(default="@gapic_generator_php//:rules_php_gapic/resources/composer.phar"),
         "composer_json": attr.label(allow_single_file=True),
     }