fix(ci): fix bzlmod issues and enable on ci (#658) (#659)

bazel-contrib · Nov 15, 2023 · 7dbb96e · 7dbb96e
1 parent d2d303a
commit 7dbb96e
Show file tree

Hide file tree

Showing 34 changed files with 208 additions and 116 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -193,7 +193,8 @@ jobs:
             --bazelrc=${{ github.workspace }}/.github/workflows/ci.bazelrc \
             --bazelrc=${{ github.workspace }}/.aspect/bazelrc/bazel${BAZEL_VERSION::1}.bazelrc \
             --bazelrc=.bazelrc \
-            test --config=${{ matrix.config }} //...
+            test --config=${{ matrix.config }} //... \
+            ${{ steps.set_bzlmod_flag.outputs.bzlmod_flag }}
         env:
           # Bazelisk will download bazel to here
           XDG_CACHE_HOME: ~/.cache/bazel-repo
@@ -208,8 +209,8 @@ jobs:
             --bazelrc=${{ github.workspace }}/.github/workflows/ci.bazelrc `
             --bazelrc=${{ github.workspace }}/.aspect/bazelrc/bazel$BAZEL_MAJOR_VERSION.bazelrc `
             --bazelrc=.bazelrc `
-            ${{ steps.set_bzlmod_flag.outputs.bzlmod_flag }} `
-            test --config=${{ matrix.config }} //...
+            test --config=${{ matrix.config }} //... `
+            ${{ steps.set_bzlmod_flag.outputs.bzlmod_flag }}
         env:
           # Bazelisk will download bazel to here
           XDG_CACHE_HOME: ~/.cache/bazel-repo
@@ -218,7 +219,7 @@ jobs:
         # Don't run integration tests on Windows since they are bash scripts and Windows runs Powershell
         if: ${{ matrix.folder == '.' && matrix.os != 'windows-latest' }}
         # Find all shell scripts within e2e, echo the filename, execute, fail on error
-        run: find e2e/*.sh -maxdepth 1 -type f -exec sh -c 'echo "\n\n------------------------------- $0 -------------------------------" && "$0" || kill $PPID' \{\} \;
+        run: find e2e/*.sh -maxdepth 1 -type f -exec sh -c 'echo "\n\n------------------------------- $0 -------------------------------" && BZLMOD_FLAG=${{ steps.set_bzlmod_flag.outputs.bzlmod_flag }} "$0" || kill $PPID' \{\} \;
 
       - name: verify bcr patches
         if: matrix.bzlmodEnabled && matrix.os == 'ubuntu-latest'

diff --git a/BUILD.bazel b/BUILD.bazel
@@ -13,9 +13,15 @@ load("//lib:yq.bzl", "yq")
 
 gazelle_binary(
     name = "gazelle_bin",
-    languages = DEFAULT_LANGUAGES + [
-        "@bazel_skylib_gazelle_plugin//bzl",
-    ],
+    languages = select({
+        # TODO: under bzlmod we get go linking errors when adding
+        # the skylib gazelle plugin.
+        # https://github.com/bazelbuild/rules_go/issues/1877
+        "@aspect_bazel_lib//lib:bzlmod": DEFAULT_LANGUAGES,
+        "//conditions:default": DEFAULT_LANGUAGES + [
+            "@bazel_skylib_gazelle_plugin//bzl",
+        ],
+    }),
 )
 
 gazelle(

diff --git a/WORKSPACE b/WORKSPACE
@@ -10,6 +10,10 @@ load(":internal_deps.bzl", "bazel_lib_internal_deps")
 # Fetch deps needed only locally for development
 bazel_lib_internal_deps()
 
+load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories")
+
+stardoc_repositories()
+
 load("//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
 
 aspect_bazel_lib_dependencies(override_local_config_platform = True)

diff --git a/docs/copy_to_bin.md b/docs/copy_to_bin.md
diff --git a/docs/copy_to_directory.md b/docs/copy_to_directory.md
diff --git a/docs/directory_path.md b/docs/directory_path.md
diff --git a/docs/expand_make_vars.md b/docs/expand_make_vars.md
diff --git a/docs/expand_template.md b/docs/expand_template.md
diff --git a/docs/host_repo.md b/docs/host_repo.md
diff --git a/docs/jq.md b/docs/jq.md
diff --git a/docs/output_files.md b/docs/output_files.md
diff --git a/docs/paths.md b/docs/paths.md
diff --git a/docs/repo_utils.md b/docs/repo_utils.md