diff --git a/.mergequeue/config.yml b/.mergequeue/config.yml deleted file mode 100644 index 357033b..0000000 --- a/.mergequeue/config.yml +++ /dev/null @@ -1,32 +0,0 @@ -version: 1.0.0 -merge_rules: - labels: - trigger: mergequeue-ready - skip_line: "" - merge_failed: "" - skip_delete_branch: "" - update_latest: true - delete_branch: false - use_rebase: true - enable_comments: true - ci_timeout_mins: 0 - preconditions: - number_of_approvals: 1 - required_checks: [] - use_github_mergeability: false - conversation_resolution_required: true - merge_mode: - type: default - parallel_mode: null - auto_update: - enabled: false - label: "" - max_runs_for_update: 0 - merge_commit: - use_title_and_body: false - merge_strategy: - name: squash - override_labels: - squash: "" - merge: "" - rebase: mergequeue-rebase diff --git a/bazel/repos.bzl b/bazel/repos.bzl index a5cf218..fe099cf 100644 --- a/bazel/repos.bzl +++ b/bazel/repos.bzl @@ -11,6 +11,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") def repos(external = True, repo_mapping = {}): """Adds repositories/archives needed by pyprotoc-plugin @@ -21,7 +22,8 @@ def repos(external = True, repo_mapping = {}): repo_mapping: passed through to all other functions that expect/use repo_mapping, e.g., 'git_repository' """ - http_archive( + maybe( + http_archive, name = "rules_python", sha256 = "9acc0944c94adb23fba1c9988b48768b1bacc6583b52a2586895c5b7491e2e31", strip_prefix = "rules_python-0.27.0",