chore: run bzlmod on ci (#523)

Author: kormide

.github/workflows/ci.yaml

@@ -78,6 +78,7 @@ jobs:
                 os: ${{ fromJSON(needs.matrix-prep-os.outputs.os) }}
                 config: ${{ fromJSON(needs.matrix-prep-config.outputs.configs) }}
                 bazelversion: ${{ fromJSON(needs.matrix-prep-bazelversion.outputs.bazelversions) }}
+                bzlmodEnabled: [true, false]
                 folder:
                     - '.'
                     - 'e2e/bzlmod'
@@ -95,6 +96,11 @@ jobs:
                     # TODO(https://github.com/aspect-build/rules_ts/issues/432): re-enable
                     - folder: e2e/bzlmod
                       config: rbe
+                    # TODO: combine bzlmod and workspace into a single 'smoke' e2e
+                    - folder: e2e/bzlmod
+                      bzlmodEnabled: false
+                    - folder: e2e/workspace
+                      bzlmodEnabled: true
 
         # Steps represent a sequence of tasks that will be executed as part of the job
         steps:
@@ -128,6 +134,13 @@ jobs:
               # then use .bazelversion to determine which Bazel version to use
               run: echo "${{ matrix.bazelversion }}" > .bazelversion
 
+            - name: Set bzlmod flag
+              # Store the --enable_bzlmod flag that we add to the test command below
+              # only when we're running bzlmod in our test matrix.
+              id: set_bzlmod_flag
+              if: matrix.bzlmodEnabled
+              run: echo "bzlmod_flag=--enable_bzlmod" >> $GITHUB_OUTPUT
+
             - name: Write RBE credentials
               if: ${{ matrix.config == 'rbe' }}
               working-directory: ${{ matrix.folder }}
@@ -143,7 +156,13 @@ jobs:
                   # Bazelisk will download bazel to here, ensure it is cached between runs.
                   XDG_CACHE_HOME: ~/.cache/bazel-repo
               working-directory: ${{ matrix.folder }}
-              run: bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc --bazelrc=.bazelrc test --config=${{ matrix.config }} //...
+              run: |
+                  bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc \
+                    --bazelrc=.bazelrc \
+                    test \
+                    --config=${{ matrix.config }} \
+                    //... \
+                    ${{ steps.set_bzlmod_flag.outputs.bzlmod_flag }}
 
     test-worker:
         runs-on: ubuntu-latest

MODULE.bazel

@@ -24,6 +24,8 @@ bazel_dep(name = "buildifier_prebuilt", version = "6.0.0.1", dev_dependency = Tr
 bazel_dep(name = "rules_nodejs", version = "5.8.2", dev_dependency = True)
 bazel_dep(name = "gazelle", version = "0.33.0", dev_dependency = True, repo_name = "bazel_gazelle")
 bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True)
+bazel_dep(name = "aspect_rules_lint", version = "0.9.1", dev_dependency = True)
+bazel_dep(name = "rules_go", version = "0.35.0", dev_dependency = True, repo_name = "io_bazel_rules_go")
 
 npm = use_extension(
     "@aspect_rules_js//npm:extensions.bzl",
@@ -44,3 +46,7 @@ rules_ts_ext = use_extension(
 )
 rules_ts_ext.deps(ts_version_from = "//examples:package.json")
 use_repo(rules_ts_ext, "npm_typescript")
+
+go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk", dev_dependency = True)
+go_sdk.download()
+use_repo(go_sdk, go_sdk = "go_default_sdk")

WORKSPACE.bzlmod

@@ -1,3 +1,14 @@
 load("//.github/workflows:deps.bzl", "aspect_workflows_github_actions_deps")
 
 aspect_workflows_github_actions_deps()
+
+# TODO: rules_lint doesn't have a way to bring deps in under bzlmod
+load(
+    "@aspect_rules_lint//format:repositories.bzl",
+    "fetch_shfmt",
+    "fetch_terraform",
+)
+
+fetch_shfmt()
+
+fetch_terraform()

e2e/external_dep/MODULE.bazel

@@ -0,0 +1,19 @@
+module(
+    version = "0.0.0",
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "aspect_rules_ts", version = "0.0.0")
+local_path_override(
+    module_name = "aspect_rules_ts",
+    path = "../..",
+)
+
+rules_ts_ext = use_extension(
+    "@aspect_rules_ts//ts:extensions.bzl",
+    "ext",
+    dev_dependency = True,
+)
+rules_ts_ext.deps()
+use_repo(rules_ts_ext, "npm_typescript")

e2e/external_dep/WORKSPACE.bzlmod

@@ -0,0 +1,19 @@
+module(
+    version = "0.0.0",
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.4.1")
+bazel_dep(name = "aspect_rules_ts", version = "0.0.0")
+local_path_override(
+    module_name = "aspect_rules_ts",
+    path = "../../..",
+)
+
+rules_ts_ext = use_extension(
+    "@aspect_rules_ts//ts:extensions.bzl",
+    "ext",
+    dev_dependency = True,
+)
+rules_ts_ext.deps()
+use_repo(rules_ts_ext, "npm_typescript")

e2e/external_dep/app/MODULE.bazel

@@ -0,0 +1,4 @@
+local_repository(
+    name = "lib_wksp",
+    path = "..",
+)

e2e/external_dep/app/WORKSPACE.bzlmod

@@ -0,0 +1,32 @@
+module(
+    version = "0.0.0",
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.4.1")
+bazel_dep(name = "aspect_bazel_lib", version = "1.38.1")
+bazel_dep(name = "aspect_rules_js", version = "1.34.0")
+bazel_dep(name = "aspect_rules_ts", version = "0.0.0")
+local_path_override(
+    module_name = "aspect_rules_ts",
+    path = "../..",
+)
+
+rules_ts_ext = use_extension(
+    "@aspect_rules_ts//ts:extensions.bzl",
+    "ext",
+    dev_dependency = True,
+)
+rules_ts_ext.deps()
+use_repo(rules_ts_ext, "npm_typescript")
+
+npm = use_extension(
+    "@aspect_rules_js//npm:extensions.bzl",
+    "npm",
+    dev_dependency = True,
+)
+npm.npm_translate_lock(
+    name = "npm",
+    pnpm_lock = "//:pnpm-lock.yaml",
+)
+use_repo(npm, "npm")