Update examples to use rules_bazel_integration_test

Signed-off-by: Adam Dierkens <adam@dierkens.com>
player-ui · Jul 19, 2024 · 729fd07 · 729fd07
1 parent 8643480
commit 729fd07
Show file tree

Hide file tree

Showing 49 changed files with 111 additions and 47 deletions.
diff --git a/.bazelignore b/.bazelignore
@@ -1,2 +0,0 @@
-javascript/examples
-kotlin/example

diff --git a/.bazelrc b/.bazelrc
@@ -28,4 +28,9 @@ coverage --remote_download_toplevel
 coverage --remote_timeout=3600
 coverage --build_metadata=REPO_URL=https://github.com/player-ui/rules_player.git
 
+# To update these lines, execute 
+# `bazel run @rules_bazel_integration_test//tools:update_deleted_packages`
+build --deleted_packages=examples/kotlin,examples/ts-monorepo,examples/ts-monorepo/packages/module-a,examples/ts-monorepo/packages/module-b
+query --deleted_packages=examples/kotlin,examples/ts-monorepo,examples/ts-monorepo/packages/module-a,examples/ts-monorepo/packages/module-b
+
 try-import %workspace%/.bazelrc.local
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -69,7 +69,7 @@ jobs:
           command: bazel test //...
       - run:
           name: Test Examples
-          command: ./scripts/test.sh
+          command: bazel test //examples:all_integration_tests
 
   release:
     executor: base

diff --git a/BUILD b/BUILD
@@ -0,0 +1,18 @@
+filegroup(
+    name = "all_files",
+    srcs = glob(["*"]),
+    visibility = ["//:__subpackages__"],
+)
+
+filegroup(
+    name = "local_repository_files",
+    # Include every package that is required by the child workspaces.
+    srcs = [
+        ":all_files",
+        "//javascript:all_files",
+        "//javascript/private:all_files",
+        "//kotlin:all_files",
+        "//kotlin/private:all_files",
+    ],
+    visibility = ["//:__subpackages__"],
+)
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -34,17 +34,24 @@ maven.install(
         "org.junit.jupiter:junit-jupiter-engine:5.7.2",
         "org.junit.platform:junit-platform-suite-api:1.7.2",
         "org.junit.platform:junit-platform-console:1.7.2",
-        "org.junit.platform:junit-platform-launcher:1.7.2"
+        "org.junit.platform:junit-platform-launcher:1.7.2",
     ],
     fetch_sources = True,
     repositories = [
         "https://repo1.maven.org/maven2",
         "https://maven.google.com/",
         "https://plugins.gradle.org/m2/",
-    ]
+    ],
 )
 use_repo(maven, "rules_player_maven")
+
 ## Rule Dependencies
 bazel_dep(name = "rules_swift", version = "1.18.0", repo_name = "build_bazel_rules_swift")
 bazel_dep(name = "rules_apple", version = "3.5.1", repo_name = "build_bazel_rules_apple")
 bazel_dep(name = "rules_ios", version = "4.3.1", repo_name = "build_bazel_rules_ios")
+
+bazel_dep(name = "rules_bazel_integration_test", version = "0.24.1", dev_dependency = True)
+bazel_binaries = use_extension("@rules_bazel_integration_test//:extensions.bzl", "bazel_binaries", dev_dependency = True)
+bazel_binaries.download(version_file = ".bazelversion")
+
+use_repo(bazel_binaries, "bazel_binaries")
diff --git a/examples/BUILD b/examples/BUILD
@@ -0,0 +1,35 @@
+load("@bazel_binaries//:defs.bzl", "bazel_binaries")
+load("@rules_bazel_integration_test//bazel_integration_test:defs.bzl", "bazel_integration_test", "default_test_runner", "integration_test_utils")
+
+default_test_runner(name = "simple_test_runner")
+
+bazel_integration_test(
+    name = "ts-monorepo-test",
+    bazel_binaries = bazel_binaries,
+    bazel_version = bazel_binaries.versions.current,
+    test_runner = ":simple_test_runner",
+    workspace_files = integration_test_utils.glob_workspace_files("ts-monorepo") + [
+        "//:local_repository_files",
+    ],
+    workspace_path = "ts-monorepo",
+)
+
+bazel_integration_test(
+    name = "kotlin-test",
+    bazel_binaries = bazel_binaries,
+    bazel_version = bazel_binaries.versions.current,
+    test_runner = ":simple_test_runner",
+    workspace_files = integration_test_utils.glob_workspace_files("kotlin") + [
+        "//:local_repository_files",
+    ],
+    workspace_path = "kotlin",
+)
+
+test_suite(
+    name = "all_integration_tests",
+    tags = integration_test_utils.DEFAULT_INTEGRATION_TEST_TAGS,
+    tests = [
+        ":kotlin-test",
+        ":ts-monorepo-test",
+    ],
+)
diff --git a/kotlin/example/.bazelrc → examples/kotlin/.bazelrc b/kotlin/example/.bazelrc → examples/kotlin/.bazelrc
diff --git a/...script/examples/ts-monorepo/.bazelversion → examples/kotlin/.bazelversion b/...script/examples/ts-monorepo/.bazelversion → examples/kotlin/.bazelversion
diff --git a/kotlin/example/BUILD → examples/kotlin/BUILD b/kotlin/example/BUILD → examples/kotlin/BUILD
diff --git a/kotlin/example/MODULE.bazel → examples/kotlin/MODULE.bazel b/kotlin/example/MODULE.bazel → examples/kotlin/MODULE.bazel
diff --git a/kotlin/example/WORKSPACE → examples/kotlin/WORKSPACE b/kotlin/example/WORKSPACE → examples/kotlin/WORKSPACE
diff --git a/kotlin/example/lib.kt → examples/kotlin/lib.kt b/kotlin/example/lib.kt → examples/kotlin/lib.kt
diff --git a/kotlin/example/libtest.kt → examples/kotlin/libtest.kt b/kotlin/example/libtest.kt → examples/kotlin/libtest.kt
diff --git a/javascript/examples/ts-monorepo/.bazelignore → examples/ts-monorepo/.bazelignore b/javascript/examples/ts-monorepo/.bazelignore → examples/ts-monorepo/.bazelignore
diff --git a/javascript/examples/ts-monorepo/.bazelrc → examples/ts-monorepo/.bazelrc b/javascript/examples/ts-monorepo/.bazelrc → examples/ts-monorepo/.bazelrc
diff --git a/kotlin/example/.bazelversion → examples/ts-monorepo/.bazelversion b/kotlin/example/.bazelversion → examples/ts-monorepo/.bazelversion
diff --git a/javascript/examples/ts-monorepo/.eslintrc.js → examples/ts-monorepo/.eslintrc.js b/javascript/examples/ts-monorepo/.eslintrc.js → examples/ts-monorepo/.eslintrc.js
diff --git a/javascript/examples/ts-monorepo/BUILD → examples/ts-monorepo/BUILD b/javascript/examples/ts-monorepo/BUILD → examples/ts-monorepo/BUILD
diff --git a/javascript/examples/ts-monorepo/MODULE.bazel → examples/ts-monorepo/MODULE.bazel b/javascript/examples/ts-monorepo/MODULE.bazel → examples/ts-monorepo/MODULE.bazel
@@ -1,7 +1,7 @@
 module(name = "ts-monorepo-example")
 
 bazel_dep(name = "rules_player")
-local_path_override(module_name = "rules_player", path = "../../..")
+local_path_override(module_name = "rules_player", path = "../..")
 
 bazel_dep(name = "bazel_skylib", version = "1.4.1")
 bazel_dep(name = "aspect_rules_js", version = "1.33.1")

diff --git a/javascript/examples/ts-monorepo/VERSION → examples/ts-monorepo/VERSION b/javascript/examples/ts-monorepo/VERSION → examples/ts-monorepo/VERSION
diff --git a/javascript/examples/ts-monorepo/WORKSPACE → examples/ts-monorepo/WORKSPACE b/javascript/examples/ts-monorepo/WORKSPACE → examples/ts-monorepo/WORKSPACE
diff --git a/javascript/examples/ts-monorepo/package.json → examples/ts-monorepo/package.json b/javascript/examples/ts-monorepo/package.json → examples/ts-monorepo/package.json
diff --git a/...mples/ts-monorepo/packages/module-a/BUILD → examples/ts-monorepo/packages/module-a/BUILD b/...mples/ts-monorepo/packages/module-a/BUILD → examples/ts-monorepo/packages/module-a/BUILD
diff --git a/...s/ts-monorepo/packages/module-a/README.md → ...s/ts-monorepo/packages/module-a/README.md b/...s/ts-monorepo/packages/module-a/README.md → ...s/ts-monorepo/packages/module-a/README.md
diff --git a/...s-monorepo/packages/module-a/package.json → ...s-monorepo/packages/module-a/package.json b/...s-monorepo/packages/module-a/package.json → ...s-monorepo/packages/module-a/package.json
diff --git a/...orepo/packages/module-a/src/index.test.ts → ...orepo/packages/module-a/src/index.test.ts b/...orepo/packages/module-a/src/index.test.ts → ...orepo/packages/module-a/src/index.test.ts
diff --git a/...s-monorepo/packages/module-a/src/index.ts → ...s-monorepo/packages/module-a/src/index.ts b/...s-monorepo/packages/module-a/src/index.ts → ...s-monorepo/packages/module-a/src/index.ts
diff --git a/...monorepo/packages/module-a/tsup.config.ts → ...monorepo/packages/module-a/tsup.config.ts b/...monorepo/packages/module-a/tsup.config.ts → ...monorepo/packages/module-a/tsup.config.ts
diff --git a/...norepo/packages/module-a/vitest.config.ts → ...norepo/packages/module-a/vitest.config.ts b/...norepo/packages/module-a/vitest.config.ts → ...norepo/packages/module-a/vitest.config.ts
diff --git a/...mples/ts-monorepo/packages/module-b/BUILD → examples/ts-monorepo/packages/module-b/BUILD b/...mples/ts-monorepo/packages/module-b/BUILD → examples/ts-monorepo/packages/module-b/BUILD
diff --git a/...s-monorepo/packages/module-b/package.json → ...s-monorepo/packages/module-b/package.json b/...s-monorepo/packages/module-b/package.json → ...s-monorepo/packages/module-b/package.json
diff --git a/...orepo/packages/module-b/package.test.json → ...orepo/packages/module-b/package.test.json b/...orepo/packages/module-b/package.test.json → ...orepo/packages/module-b/package.test.json
diff --git a/...ages/module-b/src/__tests__/entry.test.ts → ...ages/module-b/src/__tests__/entry.test.ts b/...ages/module-b/src/__tests__/entry.test.ts → ...ages/module-b/src/__tests__/entry.test.ts
diff --git a/.../ts-monorepo/packages/module-b/src/cli.ts → .../ts-monorepo/packages/module-b/src/cli.ts b/.../ts-monorepo/packages/module-b/src/cli.ts → .../ts-monorepo/packages/module-b/src/cli.ts
diff --git a/...s-monorepo/packages/module-b/src/entry.ts → ...s-monorepo/packages/module-b/src/entry.ts b/...s-monorepo/packages/module-b/src/entry.ts → ...s-monorepo/packages/module-b/src/entry.ts
diff --git a/...s-monorepo/packages/module-b/src/index.ts → ...s-monorepo/packages/module-b/src/index.ts b/...s-monorepo/packages/module-b/src/index.ts → ...s-monorepo/packages/module-b/src/index.ts
diff --git a/...monorepo/packages/module-b/tsup.config.ts → ...monorepo/packages/module-b/tsup.config.ts b/...monorepo/packages/module-b/tsup.config.ts → ...monorepo/packages/module-b/tsup.config.ts
diff --git a/...norepo/packages/module-b/vitest.config.ts → ...norepo/packages/module-b/vitest.config.ts b/...norepo/packages/module-b/vitest.config.ts → ...norepo/packages/module-b/vitest.config.ts
diff --git a/...cript/examples/ts-monorepo/pnpm-lock.yaml → examples/ts-monorepo/pnpm-lock.yaml b/...cript/examples/ts-monorepo/pnpm-lock.yaml → examples/ts-monorepo/pnpm-lock.yaml
diff --git a/.../examples/ts-monorepo/pnpm-workspace.yaml → examples/ts-monorepo/pnpm-workspace.yaml b/.../examples/ts-monorepo/pnpm-workspace.yaml → examples/ts-monorepo/pnpm-workspace.yaml
diff --git a/...script/examples/ts-monorepo/tsconfig.json → examples/ts-monorepo/tsconfig.json b/...script/examples/ts-monorepo/tsconfig.json → examples/ts-monorepo/tsconfig.json
diff --git a/...cript/examples/ts-monorepo/tsup.config.ts → examples/ts-monorepo/tsup.config.ts b/...cript/examples/ts-monorepo/tsup.config.ts → examples/ts-monorepo/tsup.config.ts
diff --git a/...ipt/examples/ts-monorepo/vitest.config.ts → examples/ts-monorepo/vitest.config.ts b/...ipt/examples/ts-monorepo/vitest.config.ts → examples/ts-monorepo/vitest.config.ts
diff --git a/.../examples/ts-monorepo/workspace_status.sh → examples/ts-monorepo/workspace_status.sh b/.../examples/ts-monorepo/workspace_status.sh → examples/ts-monorepo/workspace_status.sh
diff --git a/javascript/BUILD b/javascript/BUILD
@@ -2,6 +2,12 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 exports_files(["defs.bzl"])
 
+filegroup(
+    name = "all_files",
+    srcs = glob(["*"]),
+    visibility = ["//:__subpackages__"],
+)
+
 bzl_library(
     name = "defs",
     srcs = ["defs.bzl"],

diff --git a/javascript/private/BUILD b/javascript/private/BUILD
@@ -1,5 +1,11 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@aspect_rules_js//js:defs.bzl", "js_binary")
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["*"]),
+    visibility = ["//:__subpackages__"],
+)
 
 exports_files(
     glob(["*.bzl"]),

diff --git a/kotlin/BUILD b/kotlin/BUILD
@@ -2,13 +2,19 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 exports_files(["defs.bzl"])
 
+filegroup(
+    name = "all_files",
+    srcs = glob(["*"]),
+    visibility = ["//:__subpackages__"],
+)
+
 bzl_library(
     name = "defs",
     srcs = ["defs.bzl"],
     visibility = ["//visibility:public"],
     deps = [
-        "//kotlin/private:lint",
         "//kotlin/private:distribution",
-        "//kotlin/private:kt_jvm"
+        "//kotlin/private:kt_jvm",
+        "//kotlin/private:lint",
     ],
-)
+)
diff --git a/kotlin/private/BUILD b/kotlin/private/BUILD
@@ -1,19 +1,28 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
+filegroup(
+    name = "all_files",
+    srcs = glob(["*"]),
+    visibility = ["//:__subpackages__"],
+)
+
 bzl_library(
     name = "lint",
     srcs = ["lint.bzl"],
     visibility = [
         "//kotlin:__subpackages__",
     ],
     deps = [
-        ":scope_name"
-    ]
+        ":scope_name",
+    ],
 )
 
 bzl_library(
     name = "junit",
-    srcs = ["junit_test.bzl", "junit5.bzl"],
+    srcs = [
+        "junit5.bzl",
+        "junit_test.bzl",
+    ],
     visibility = [
         "//kotlin:__subpackages__",
     ],
@@ -28,24 +37,24 @@ bzl_library(
     deps = [
         ":scope_name",
         "@rules_jvm_external//:defs.bzl",
-    ]
+    ],
 )
 
 bzl_library(
     name = "kt_jvm",
-    srcs = ["kt_jvm.bzl",],
+    srcs = ["kt_jvm.bzl"],
     visibility = [
         "//kotlin:__subpackages__",
     ],
     deps = [
-        ":lint",
         ":distribution",
-        ":kt_jvm_library_and_test.bzl",
         ":junit",
-        "@rules_kotlin//kotlin",
-        "@rules_jvm_external//:implementation",
+        ":kt_jvm_library_and_test.bzl",
+        ":lint",
         "@rules_java//java:rules",
-    ]
+        "@rules_jvm_external//:implementation",
+        "@rules_kotlin//kotlin",
+    ],
 )
 
 bzl_library(
@@ -55,4 +64,4 @@ bzl_library(
         "//kotlin:__subpackages__",
     ],
     deps = [],
-)
+)
diff --git a/scripts/test.sh b/scripts/test.sh