From 883253871e2db46f68a46de8db0cf02138e73d12 Mon Sep 17 00:00:00 2001 From: Tony Aiuto Date: Fri, 10 Nov 2023 23:51:42 -0500 Subject: [PATCH 1/6] XXXX --- WORKSPACE.bzlmod | 14 +++++++------- doc_build/BUILD | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index e5300a3a..bd7b5d4e 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -14,10 +14,10 @@ local_repository( # verbose = False, #) -# Needed for making our release notes -#load("//toolchains/git:git_configure.bzl", "experimental_find_system_git") -# -#experimental_find_system_git( -# name = "rules_pkg_git", -# verbose = False, -#) + Needed for making our release notes +load("//toolchains/git:git_configure.bzl", "experimental_find_system_git") + +experimental_find_system_git( + name = "rules_pkg_git", + verbose = False, +) diff --git a/doc_build/BUILD b/doc_build/BUILD index 725da8e2..6e2ed053 100644 --- a/doc_build/BUILD +++ b/doc_build/BUILD @@ -20,7 +20,7 @@ How to: """ load("@bazel_skylib//:bzl_library.bzl", "bzl_library") -load("@bazel_stardoc//stardoc:stardoc.bzl", "stardoc") +load("@stardoc//stardoc:stardoc.bzl", "stardoc") load("//:version.bzl", "version") package(default_applicable_licenses = ["//:license"]) From 8ff5da611d24537d7ccfdf73a79b9e0b4a8f19f9 Mon Sep 17 00:00:00 2001 From: Tony Aiuto Date: Sat, 11 Nov 2023 00:01:14 -0500 Subject: [PATCH 2/6] do not use bzlmod for integration test --- .bazelci/integration.yml | 14 +++++--------- doc_build/BUILD | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.bazelci/integration.yml b/.bazelci/integration.yml index d73a4d75..f11279d4 100644 --- a/.bazelci/integration.yml +++ b/.bazelci/integration.yml @@ -1,12 +1,5 @@ -lts: <s - bazel: latest - -rolling: &rolling - bazel: rolling - common: &common - platform: ubuntu1804 working_directory: .. build_targets: - "distro:*" @@ -14,10 +7,13 @@ common: &common tasks: rolling_ubuntu: name: rolling_distro - <<: *rolling + platform: ubuntu1804 + bazel: rolling + build_flags: + - "--noenable_bzlmod" <<: *common lts_ubuntu: name: lts_distro platform: ubuntu1804 - <<: *lts + bazel: latest <<: *common diff --git a/doc_build/BUILD b/doc_build/BUILD index 6e2ed053..725da8e2 100644 --- a/doc_build/BUILD +++ b/doc_build/BUILD @@ -20,7 +20,7 @@ How to: """ load("@bazel_skylib//:bzl_library.bzl", "bzl_library") -load("@stardoc//stardoc:stardoc.bzl", "stardoc") +load("@bazel_stardoc//stardoc:stardoc.bzl", "stardoc") load("//:version.bzl", "version") package(default_applicable_licenses = ["//:license"]) From 286830fe4701ff1029432547d8bb71a75086c9dd Mon Sep 17 00:00:00 2001 From: Tony Aiuto Date: Sat, 11 Nov 2023 00:05:19 -0500 Subject: [PATCH 3/6] typo --- WORKSPACE.bzlmod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index bd7b5d4e..890d285c 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -14,7 +14,7 @@ local_repository( # verbose = False, #) - Needed for making our release notes +# Needed for making our release notes load("//toolchains/git:git_configure.bzl", "experimental_find_system_git") experimental_find_system_git( From 5d8d15ab68eb0d791ea7aea00ae0297811e04745 Mon Sep 17 00:00:00 2001 From: Tony Aiuto Date: Sat, 11 Nov 2023 00:07:38 -0500 Subject: [PATCH 4/6] change distro target --- .bazelci/integration.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.bazelci/integration.yml b/.bazelci/integration.yml index f11279d4..cf05c442 100644 --- a/.bazelci/integration.yml +++ b/.bazelci/integration.yml @@ -2,15 +2,13 @@ common: &common working_directory: .. build_targets: - - "distro:*" + - "distro:all" tasks: rolling_ubuntu: name: rolling_distro platform: ubuntu1804 bazel: rolling - build_flags: - - "--noenable_bzlmod" <<: *common lts_ubuntu: name: lts_distro From 728dedc405f599e2769a9cec997a6e934b177cf4 Mon Sep 17 00:00:00 2001 From: Tony Aiuto Date: Sat, 11 Nov 2023 00:21:34 -0500 Subject: [PATCH 5/6] sigh --- WORKSPACE.bzlmod | 8 ++++++-- toolchains/git/git_configure.bzl | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index 890d285c..3a25ac48 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -15,9 +15,13 @@ local_repository( #) # Needed for making our release notes -load("//toolchains/git:git_configure.bzl", "experimental_find_system_git") +load("//toolchains/git:git_configure.bzl", "experimental_find_system_git_bzlmod") -experimental_find_system_git( +experimental_find_system_git_bzlmod( name = "rules_pkg_git", verbose = False, ) +register_toolchains( + "@rules_pkg_git//:git_auto_toolchain", + "//toolchains/git:git_missing_toolchain", +) diff --git a/toolchains/git/git_configure.bzl b/toolchains/git/git_configure.bzl index c1f9a0e7..f537c1a1 100644 --- a/toolchains/git/git_configure.bzl +++ b/toolchains/git/git_configure.bzl @@ -58,6 +58,7 @@ _find_system_git = repository_rule( }, ) +# buildifier: disable=function-docstring-args def experimental_find_system_git(name, workspace_file = None, verbose = False): """Create a toolchain that lets you run git. @@ -76,3 +77,19 @@ def experimental_find_system_git(name, workspace_file = None, verbose = False): "@%s//:git_auto_toolchain" % name, "@rules_pkg//toolchains/git:git_missing_toolchain", ) + +# buildifier: disable=function-docstring-args +def experimental_find_system_git_bzlmod(name, workspace_file = None, verbose = False): + """Create a toolchain that lets you run git. + + WARNING: This is experimental. The API and behavior are subject to change + at any time. + + This presumes that your Bazel WORKSPACE file is located under your git + client. That is often true, but might not be in a multi-repo where you + might weave together a Bazel workspace from several git repos that are + all rooted under the WORKSPACE file. + """ + if not workspace_file: + workspace_file = Label("//:MODULE.bazel") + _find_system_git(name = name, workspace_file = workspace_file, verbose = verbose) From f3672bf4d36836d2cea406c13c4bb4bb2ee95857 Mon Sep 17 00:00:00 2001 From: Tony Aiuto Date: Sat, 11 Nov 2023 00:26:24 -0500 Subject: [PATCH 6/6] split out doc_build to non bzlmod --- .bazelci/tests.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.bazelci/tests.yml b/.bazelci/tests.yml index 3fc01113..d64a858e 100644 --- a/.bazelci/tests.yml +++ b/.bazelci/tests.yml @@ -61,10 +61,6 @@ ubuntu1804: &ubuntu platform: ubuntu1804 <<: *common <<: *default_tests - build_targets: - - "//distro:distro" - - "//distro:relnotes" - - "//doc_build:*" centos7: ¢os platform: centos7_java11_devtoolset10 @@ -94,6 +90,9 @@ tasks: platform: ubuntu1804 build_flags: - "--enable_bzlmod" + build_targets: + - "//distro:distro" + - "//distro:relnotes" <<: *common <<: *rolling <<: *default_tests @@ -118,6 +117,10 @@ tasks: name: lts_ubuntu <<: *ubuntu <<: *lts + build_targets: + - "//distro:distro" + - "//distro:relnotes" + - "//doc_build:*" lts_windows: name: lts_windows <<: *windows