Compare commits
10 Commits
v1.0.0
...
54109136ab
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
54109136ab | ||
|
|
3e5ed611fe | ||
|
|
3085d3ce98 | ||
|
|
143db9c20e | ||
|
|
4f9dff66c1 | ||
|
|
fbe1eb3fc8 | ||
|
|
08f2abc60e | ||
|
|
65404a1883 | ||
|
|
f317a618b8 | ||
|
|
683de60603 |
1
.bazelversion
Normal file
1
.bazelversion
Normal file
@@ -0,0 +1 @@
|
|||||||
|
9.0.1
|
||||||
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
@@ -25,10 +25,10 @@ jobs:
|
|||||||
phase8_target: windows
|
phase8_target: windows
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
env:
|
env:
|
||||||
USE_BAZEL_VERSION: 9.0.0
|
USE_BAZEL_VERSION: 9.0.1
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: bazel-contrib/setup-bazel@0.15.0
|
- uses: bazel-contrib/setup-bazel@0.18.0
|
||||||
with:
|
with:
|
||||||
bazelisk-cache: true
|
bazelisk-cache: true
|
||||||
repository-cache: true
|
repository-cache: true
|
||||||
@@ -36,6 +36,8 @@ jobs:
|
|||||||
disk-cache: ci-${{ matrix.phase8_target }}
|
disk-cache: ci-${{ matrix.phase8_target }}
|
||||||
cache-save: ${{ github.event_name != 'pull_request' }}
|
cache-save: ${{ github.event_name != 'pull_request' }}
|
||||||
- name: Run tests (${{ matrix.phase8_target }})
|
- name: Run tests (${{ matrix.phase8_target }})
|
||||||
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo "Phase 8 target: ${{ matrix.phase8_target }}"
|
echo "Phase 8 target: ${{ matrix.phase8_target }}"
|
||||||
bazel test //tests/...
|
targets="$(./tests/ci_test/phase8_ci_targets.sh "${{ matrix.phase8_target }}")"
|
||||||
|
bazel test --test_output=errors ${targets}
|
||||||
|
|||||||
4
.github/workflows/pages.yml
vendored
4
.github/workflows/pages.yml
vendored
@@ -23,14 +23,14 @@ jobs:
|
|||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
USE_BAZEL_VERSION: 9.0.0
|
USE_BAZEL_VERSION: 9.0.1
|
||||||
environment:
|
environment:
|
||||||
name: github-pages
|
name: github-pages
|
||||||
url: ${{ steps.deployment.outputs.page_url }}
|
url: ${{ steps.deployment.outputs.page_url }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- uses: bazel-contrib/setup-bazel@0.15.0
|
- uses: bazel-contrib/setup-bazel@0.18.0
|
||||||
with:
|
with:
|
||||||
bazelisk-cache: true
|
bazelisk-cache: true
|
||||||
repository-cache: true
|
repository-cache: true
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
module(
|
module(
|
||||||
name = "rules_bun",
|
name = "rules_bun",
|
||||||
version = "1.0.0",
|
version = "1.0.2",
|
||||||
)
|
)
|
||||||
|
|
||||||
# Core ruleset dependencies.
|
# Core ruleset dependencies.
|
||||||
|
|||||||
15
MODULE.bazel.lock
generated
15
MODULE.bazel.lock
generated
@@ -34,8 +34,9 @@
|
|||||||
"https://bcr.bazel.build/modules/bazel_features/1.3.0/MODULE.bazel": "cdcafe83ec318cda34e02948e81d790aab8df7a929cec6f6969f13a489ccecd9",
|
"https://bcr.bazel.build/modules/bazel_features/1.3.0/MODULE.bazel": "cdcafe83ec318cda34e02948e81d790aab8df7a929cec6f6969f13a489ccecd9",
|
||||||
"https://bcr.bazel.build/modules/bazel_features/1.30.0/MODULE.bazel": "a14b62d05969a293b80257e72e597c2da7f717e1e69fa8b339703ed6731bec87",
|
"https://bcr.bazel.build/modules/bazel_features/1.30.0/MODULE.bazel": "a14b62d05969a293b80257e72e597c2da7f717e1e69fa8b339703ed6731bec87",
|
||||||
"https://bcr.bazel.build/modules/bazel_features/1.33.0/MODULE.bazel": "8b8dc9d2a4c88609409c3191165bccec0e4cb044cd7a72ccbe826583303459f6",
|
"https://bcr.bazel.build/modules/bazel_features/1.33.0/MODULE.bazel": "8b8dc9d2a4c88609409c3191165bccec0e4cb044cd7a72ccbe826583303459f6",
|
||||||
"https://bcr.bazel.build/modules/bazel_features/1.33.0/source.json": "13617db3930328c2cd2807a0f13d52ca870ac05f96db9668655113265147b2a6",
|
|
||||||
"https://bcr.bazel.build/modules/bazel_features/1.4.1/MODULE.bazel": "e45b6bb2350aff3e442ae1111c555e27eac1d915e77775f6fdc4b351b758b5d7",
|
"https://bcr.bazel.build/modules/bazel_features/1.4.1/MODULE.bazel": "e45b6bb2350aff3e442ae1111c555e27eac1d915e77775f6fdc4b351b758b5d7",
|
||||||
|
"https://bcr.bazel.build/modules/bazel_features/1.42.1/MODULE.bazel": "275a59b5406ff18c01739860aa70ad7ccb3cfb474579411decca11c93b951080",
|
||||||
|
"https://bcr.bazel.build/modules/bazel_features/1.42.1/source.json": "fcd4396b2df85f64f2b3bb436ad870793ecf39180f1d796f913cc9276d355309",
|
||||||
"https://bcr.bazel.build/modules/bazel_features/1.9.1/MODULE.bazel": "8f679097876a9b609ad1f60249c49d68bfab783dd9be012faf9d82547b14815a",
|
"https://bcr.bazel.build/modules/bazel_features/1.9.1/MODULE.bazel": "8f679097876a9b609ad1f60249c49d68bfab783dd9be012faf9d82547b14815a",
|
||||||
"https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8",
|
"https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8",
|
||||||
"https://bcr.bazel.build/modules/bazel_skylib/1.1.1/MODULE.bazel": "1add3e7d93ff2e6998f9e118022c84d163917d912f5afafb3058e3d2f1545b5e",
|
"https://bcr.bazel.build/modules/bazel_skylib/1.1.1/MODULE.bazel": "1add3e7d93ff2e6998f9e118022c84d163917d912f5afafb3058e3d2f1545b5e",
|
||||||
@@ -51,8 +52,8 @@
|
|||||||
"https://bcr.bazel.build/modules/bazel_skylib/1.8.1/MODULE.bazel": "88ade7293becda963e0e3ea33e7d54d3425127e0a326e0d17da085a5f1f03ff6",
|
"https://bcr.bazel.build/modules/bazel_skylib/1.8.1/MODULE.bazel": "88ade7293becda963e0e3ea33e7d54d3425127e0a326e0d17da085a5f1f03ff6",
|
||||||
"https://bcr.bazel.build/modules/bazel_skylib/1.8.2/MODULE.bazel": "69ad6927098316848b34a9142bcc975e018ba27f08c4ff403f50c1b6e646ca67",
|
"https://bcr.bazel.build/modules/bazel_skylib/1.8.2/MODULE.bazel": "69ad6927098316848b34a9142bcc975e018ba27f08c4ff403f50c1b6e646ca67",
|
||||||
"https://bcr.bazel.build/modules/bazel_skylib/1.8.2/source.json": "34a3c8bcf233b835eb74be9d628899bb32999d3e0eadef1947a0a562a2b16ffb",
|
"https://bcr.bazel.build/modules/bazel_skylib/1.8.2/source.json": "34a3c8bcf233b835eb74be9d628899bb32999d3e0eadef1947a0a562a2b16ffb",
|
||||||
"https://bcr.bazel.build/modules/buildozer/8.2.1/MODULE.bazel": "61e9433c574c2bd9519cad7fa66b9c1d2b8e8d5f3ae5d6528a2c2d26e68d874d",
|
"https://bcr.bazel.build/modules/buildozer/8.5.1/MODULE.bazel": "a35d9561b3fc5b18797c330793e99e3b834a473d5fbd3d7d7634aafc9bdb6f8f",
|
||||||
"https://bcr.bazel.build/modules/buildozer/8.2.1/source.json": "7c33f6a26ee0216f85544b4bca5e9044579e0219b6898dd653f5fb449cf2e484",
|
"https://bcr.bazel.build/modules/buildozer/8.5.1/source.json": "e3386e6ff4529f2442800dee47ad28d3e6487f36a1f75ae39ae56c70f0cd2fbd",
|
||||||
"https://bcr.bazel.build/modules/google_benchmark/1.8.2/MODULE.bazel": "a70cf1bba851000ba93b58ae2f6d76490a9feb74192e57ab8e8ff13c34ec50cb",
|
"https://bcr.bazel.build/modules/google_benchmark/1.8.2/MODULE.bazel": "a70cf1bba851000ba93b58ae2f6d76490a9feb74192e57ab8e8ff13c34ec50cb",
|
||||||
"https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
|
"https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4",
|
||||||
"https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6",
|
"https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6",
|
||||||
@@ -112,8 +113,8 @@
|
|||||||
"https://bcr.bazel.build/modules/rules_cc/0.1.5/MODULE.bazel": "88dfc9361e8b5ae1008ac38f7cdfd45ad738e4fa676a3ad67d19204f045a1fd8",
|
"https://bcr.bazel.build/modules/rules_cc/0.1.5/MODULE.bazel": "88dfc9361e8b5ae1008ac38f7cdfd45ad738e4fa676a3ad67d19204f045a1fd8",
|
||||||
"https://bcr.bazel.build/modules/rules_cc/0.2.0/MODULE.bazel": "b5c17f90458caae90d2ccd114c81970062946f49f355610ed89bebf954f5783c",
|
"https://bcr.bazel.build/modules/rules_cc/0.2.0/MODULE.bazel": "b5c17f90458caae90d2ccd114c81970062946f49f355610ed89bebf954f5783c",
|
||||||
"https://bcr.bazel.build/modules/rules_cc/0.2.13/MODULE.bazel": "eecdd666eda6be16a8d9dc15e44b5c75133405e820f620a234acc4b1fdc5aa37",
|
"https://bcr.bazel.build/modules/rules_cc/0.2.13/MODULE.bazel": "eecdd666eda6be16a8d9dc15e44b5c75133405e820f620a234acc4b1fdc5aa37",
|
||||||
"https://bcr.bazel.build/modules/rules_cc/0.2.14/MODULE.bazel": "353c99ed148887ee89c54a17d4100ae7e7e436593d104b668476019023b58df8",
|
"https://bcr.bazel.build/modules/rules_cc/0.2.17/MODULE.bazel": "1849602c86cb60da8613d2de887f9566a6d354a6df6d7009f9d04a14402f9a84",
|
||||||
"https://bcr.bazel.build/modules/rules_cc/0.2.14/source.json": "55d0a4587c5592fad350f6e698530f4faf0e7dd15e69d43f8d87e220c78bea54",
|
"https://bcr.bazel.build/modules/rules_cc/0.2.17/source.json": "3832f45d145354049137c0090df04629d9c2b5493dc5c2bf46f1834040133a07",
|
||||||
"https://bcr.bazel.build/modules/rules_cc/0.2.8/MODULE.bazel": "f1df20f0bf22c28192a794f29b501ee2018fa37a3862a1a2132ae2940a23a642",
|
"https://bcr.bazel.build/modules/rules_cc/0.2.8/MODULE.bazel": "f1df20f0bf22c28192a794f29b501ee2018fa37a3862a1a2132ae2940a23a642",
|
||||||
"https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6",
|
"https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6",
|
||||||
"https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/MODULE.bazel": "40c97d1144356f52905566c55811f13b299453a14ac7769dfba2ac38192337a8",
|
"https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/MODULE.bazel": "40c97d1144356f52905566c55811f13b299453a14ac7769dfba2ac38192337a8",
|
||||||
@@ -193,7 +194,7 @@
|
|||||||
"//bun:extensions.bzl%bun": {
|
"//bun:extensions.bzl%bun": {
|
||||||
"general": {
|
"general": {
|
||||||
"bzlTransitiveDigest": "314UOH4dQIGBHGpxCwA7yzI++E2J3bjIc20m5MZhM7U=",
|
"bzlTransitiveDigest": "314UOH4dQIGBHGpxCwA7yzI++E2J3bjIc20m5MZhM7U=",
|
||||||
"usagesDigest": "F7vNx1FkssnJKNa2AZDuwHKkH7+IjJNX42lRAaJhhKE=",
|
"usagesDigest": "8lJhlTN0tALSLMIVpAoPHAUJ7DsvdI3M6FYRhgsDFtU=",
|
||||||
"recordedInputs": [
|
"recordedInputs": [
|
||||||
"REPO_MAPPING:,bazel_tools bazel_tools"
|
"REPO_MAPPING:,bazel_tools bazel_tools"
|
||||||
],
|
],
|
||||||
@@ -284,7 +285,7 @@
|
|||||||
"//bun:extensions.bzl%bun_install": {
|
"//bun:extensions.bzl%bun_install": {
|
||||||
"general": {
|
"general": {
|
||||||
"bzlTransitiveDigest": "314UOH4dQIGBHGpxCwA7yzI++E2J3bjIc20m5MZhM7U=",
|
"bzlTransitiveDigest": "314UOH4dQIGBHGpxCwA7yzI++E2J3bjIc20m5MZhM7U=",
|
||||||
"usagesDigest": "5mKuORKUFhw+/OMHQF0I8Ngq0GV2eqMaOTDmyqaQa8M=",
|
"usagesDigest": "x+qjsT8RcvKKj6+UXY1J8kq8wHRbimCNctw3IUTdYzY=",
|
||||||
"recordedInputs": [
|
"recordedInputs": [
|
||||||
"REPO_MAPPING:,bazel_tools bazel_tools"
|
"REPO_MAPPING:,bazel_tools bazel_tools"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ Release announcements should provide a copy-pasteable module snippet in the
|
|||||||
standard ruleset form:
|
standard ruleset form:
|
||||||
|
|
||||||
```starlark
|
```starlark
|
||||||
bazel_dep(name = "rules_bun", version = "1.0.0")
|
bazel_dep(name = "rules_bun", version = "1.0.2")
|
||||||
```
|
```
|
||||||
|
|
||||||
Then add the Bun repositories and register the toolchains in `MODULE.bazel`:
|
Then add the Bun repositories and register the toolchains in `MODULE.bazel`:
|
||||||
|
|||||||
13
flake.nix
13
flake.nix
@@ -15,7 +15,7 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
bazelVersion = "9.0.0";
|
bazelVersion = "9.0.1";
|
||||||
in
|
in
|
||||||
repo-lib.lib.mkRepo {
|
repo-lib.lib.mkRepo {
|
||||||
inherit self nixpkgs;
|
inherit self nixpkgs;
|
||||||
@@ -108,12 +108,6 @@
|
|||||||
version.args = [ "--version" ];
|
version.args = [ "--version" ];
|
||||||
banner.color = "YELLOW";
|
banner.color = "YELLOW";
|
||||||
})
|
})
|
||||||
(repo-lib.lib.tools.fromPackage {
|
|
||||||
name = "Go";
|
|
||||||
package = pkgs.go;
|
|
||||||
version.args = [ "version" ];
|
|
||||||
banner.color = "CYAN";
|
|
||||||
})
|
|
||||||
(repo-lib.lib.tools.fromPackage {
|
(repo-lib.lib.tools.fromPackage {
|
||||||
name = "Bazel";
|
name = "Bazel";
|
||||||
package = bazel9;
|
package = bazel9;
|
||||||
@@ -123,20 +117,17 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
shell.packages = [
|
shell.packages = [
|
||||||
pkgs.gopls
|
|
||||||
pkgs.gotools
|
|
||||||
pkgs.bazel-buildtools
|
pkgs.bazel-buildtools
|
||||||
self.packages.${system}.release
|
self.packages.${system}.release
|
||||||
];
|
];
|
||||||
|
|
||||||
checks.tests = {
|
checks.tests = {
|
||||||
command = "bazel test //tests/...";
|
command = "bazelisk test //tests/...";
|
||||||
stage = "pre-push";
|
stage = "pre-push";
|
||||||
passFilenames = false;
|
passFilenames = false;
|
||||||
runtimeInputs = [
|
runtimeInputs = [
|
||||||
bazel9
|
bazel9
|
||||||
pkgs.bun
|
pkgs.bun
|
||||||
pkgs.go
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1 +1,3 @@
|
|||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
|
exports_files(["nested_bazel_test.sh"])
|
||||||
|
|||||||
@@ -197,11 +197,16 @@ sh_test(
|
|||||||
name = "bundle_sourcemap_shape_test",
|
name = "bundle_sourcemap_shape_test",
|
||||||
size = "small",
|
size = "small",
|
||||||
srcs = ["verify_sourcemap_shape.sh"],
|
srcs = ["verify_sourcemap_shape.sh"],
|
||||||
|
tags = [
|
||||||
|
"exclusive",
|
||||||
|
"no-sandbox",
|
||||||
|
],
|
||||||
data = [
|
data = [
|
||||||
"BUILD.bazel",
|
"BUILD.bazel",
|
||||||
"//:repo_runtime_files",
|
"//:repo_runtime_files",
|
||||||
"//bun:repo_runtime_files",
|
"//bun:repo_runtime_files",
|
||||||
"//internal:repo_runtime_files",
|
"//internal:repo_runtime_files",
|
||||||
|
"//tests:nested_bazel_test.sh",
|
||||||
"//tests/bundle_test/sourcemap_case:BUILD.bazel",
|
"//tests/bundle_test/sourcemap_case:BUILD.bazel",
|
||||||
"//tests/bundle_test/sourcemap_case:entry.ts",
|
"//tests/bundle_test/sourcemap_case:entry.ts",
|
||||||
],
|
],
|
||||||
@@ -236,6 +241,10 @@ sh_test(
|
|||||||
name = "bun_build_compile_flag_shape_test",
|
name = "bun_build_compile_flag_shape_test",
|
||||||
size = "small",
|
size = "small",
|
||||||
srcs = ["verify_flag_aquery.sh"],
|
srcs = ["verify_flag_aquery.sh"],
|
||||||
|
tags = [
|
||||||
|
"exclusive",
|
||||||
|
"no-sandbox",
|
||||||
|
],
|
||||||
data = [
|
data = [
|
||||||
"BUILD.bazel",
|
"BUILD.bazel",
|
||||||
"cli.ts",
|
"cli.ts",
|
||||||
@@ -246,6 +255,7 @@ sh_test(
|
|||||||
"//:repo_runtime_files",
|
"//:repo_runtime_files",
|
||||||
"//bun:repo_runtime_files",
|
"//bun:repo_runtime_files",
|
||||||
"//internal:repo_runtime_files",
|
"//internal:repo_runtime_files",
|
||||||
|
"//tests:nested_bazel_test.sh",
|
||||||
],
|
],
|
||||||
env_inherit = ["PATH"],
|
env_inherit = ["PATH"],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,49 +1,20 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
if command -v bazel >/dev/null 2>&1; then
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
bazel_cmd=(bazel)
|
# shellcheck source=../nested_bazel_test.sh
|
||||||
elif command -v bazelisk >/dev/null 2>&1; then
|
source "${script_dir}/../nested_bazel_test.sh"
|
||||||
bazel_cmd=(bazelisk)
|
setup_nested_bazel_cmd
|
||||||
else
|
|
||||||
echo "bazel or bazelisk is required on PATH" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
find_workspace_root() {
|
rules_bun_root="$(find_nested_bazel_workspace_root "${BASH_SOURCE[0]}")"
|
||||||
local candidate
|
|
||||||
local module_path
|
|
||||||
local script_dir
|
|
||||||
|
|
||||||
for candidate in \
|
cleanup() {
|
||||||
"${TEST_SRCDIR:-}/${TEST_WORKSPACE:-}" \
|
local status="$1"
|
||||||
"${TEST_SRCDIR:-}/_main"; do
|
trap - EXIT
|
||||||
if [[ -n ${candidate} && -f "${candidate}/MODULE.bazel" ]]; then
|
shutdown_nested_bazel_workspace "${rules_bun_root}"
|
||||||
printf '%s\n' "${candidate}"
|
exit "${status}"
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ -n ${TEST_SRCDIR:-} ]]; then
|
|
||||||
module_path="$(find "${TEST_SRCDIR}" -maxdepth 3 -name MODULE.bazel -print -quit 2>/dev/null || true)"
|
|
||||||
if [[ -n ${module_path} ]]; then
|
|
||||||
dirname "${module_path}"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
|
||||||
candidate="$(cd "${script_dir}/../.." && pwd -P)"
|
|
||||||
if [[ -f "${candidate}/MODULE.bazel" ]]; then
|
|
||||||
printf '%s\n' "${candidate}"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Unable to locate rules_bun workspace root" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
}
|
||||||
|
trap 'cleanup $?' EXIT
|
||||||
rules_bun_root="$(find_workspace_root)"
|
|
||||||
|
|
||||||
run_aquery() {
|
run_aquery() {
|
||||||
local mnemonic="$1"
|
local mnemonic="$1"
|
||||||
|
|||||||
@@ -1,49 +1,20 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
if command -v bazel >/dev/null 2>&1; then
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
bazel_cmd=(bazel)
|
# shellcheck source=../nested_bazel_test.sh
|
||||||
elif command -v bazelisk >/dev/null 2>&1; then
|
source "${script_dir}/../nested_bazel_test.sh"
|
||||||
bazel_cmd=(bazelisk)
|
setup_nested_bazel_cmd
|
||||||
else
|
|
||||||
echo "bazel or bazelisk is required on PATH" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
find_workspace_root() {
|
rules_bun_root="$(find_nested_bazel_workspace_root "${BASH_SOURCE[0]}")"
|
||||||
local candidate
|
|
||||||
local module_path
|
|
||||||
local script_dir
|
|
||||||
|
|
||||||
for candidate in \
|
cleanup() {
|
||||||
"${TEST_SRCDIR:-}/${TEST_WORKSPACE:-}" \
|
local status="$1"
|
||||||
"${TEST_SRCDIR:-}/_main"; do
|
trap - EXIT
|
||||||
if [[ -n ${candidate} && -f "${candidate}/MODULE.bazel" ]]; then
|
shutdown_nested_bazel_workspace "${rules_bun_root}"
|
||||||
printf '%s\n' "${candidate}"
|
exit "${status}"
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [[ -n ${TEST_SRCDIR:-} ]]; then
|
|
||||||
module_path="$(find "${TEST_SRCDIR}" -maxdepth 3 -name MODULE.bazel -print -quit 2>/dev/null || true)"
|
|
||||||
if [[ -n ${module_path} ]]; then
|
|
||||||
dirname "${module_path}"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
|
||||||
candidate="$(cd "${script_dir}/../.." && pwd -P)"
|
|
||||||
if [[ -f "${candidate}/MODULE.bazel" ]]; then
|
|
||||||
printf '%s\n' "${candidate}"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Unable to locate rules_bun workspace root" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
}
|
||||||
|
trap 'cleanup $?' EXIT
|
||||||
rules_bun_root="$(find_workspace_root)"
|
|
||||||
|
|
||||||
bundle_output="$(
|
bundle_output="$(
|
||||||
cd "${rules_bun_root}" &&
|
cd "${rules_bun_root}" &&
|
||||||
|
|||||||
@@ -8,6 +8,14 @@ sh_test(
|
|||||||
data = ["//.github/workflows:ci.yml"],
|
data = ["//.github/workflows:ci.yml"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
sh_test(
|
||||||
|
name = "phase8_ci_targets_test",
|
||||||
|
size = "small",
|
||||||
|
srcs = ["phase8_ci_targets_test.sh"],
|
||||||
|
args = ["$(location :phase8_ci_targets.sh)"],
|
||||||
|
data = [":phase8_ci_targets.sh"],
|
||||||
|
)
|
||||||
|
|
||||||
sh_test(
|
sh_test(
|
||||||
name = "native_wrapper_shape_test",
|
name = "native_wrapper_shape_test",
|
||||||
size = "small",
|
size = "small",
|
||||||
|
|||||||
@@ -17,11 +17,22 @@ check_pattern() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_pattern '^name:[[:space:]]+CI$' "missing workflow name CI"
|
check_pattern '^name:[[:space:]]+CI$' "missing workflow name CI"
|
||||||
check_pattern 'USE_BAZEL_VERSION:[[:space:]]+9\.0\.0' "missing Bazel 9.0.0 pin"
|
check_pattern 'USE_BAZEL_VERSION:[[:space:]]+9\.0\.1' "missing Bazel 9.0.1 pin"
|
||||||
check_pattern 'os:[[:space:]]+ubuntu-latest' "missing ubuntu matrix entry"
|
check_pattern 'os:[[:space:]]+ubuntu-latest' "missing ubuntu matrix entry"
|
||||||
check_pattern 'phase8_target:[[:space:]]+linux-x64' "missing linux-x64 matrix target"
|
check_pattern 'phase8_target:[[:space:]]+linux-x64' "missing linux-x64 matrix target"
|
||||||
check_pattern 'os:[[:space:]]+macos-14' "missing macos matrix entry"
|
check_pattern 'os:[[:space:]]+macos-14' "missing macos matrix entry"
|
||||||
check_pattern 'phase8_target:[[:space:]]+darwin-arm64' "missing darwin-arm64 matrix target"
|
check_pattern 'phase8_target:[[:space:]]+darwin-arm64' "missing darwin-arm64 matrix target"
|
||||||
check_pattern 'os:[[:space:]]+windows-latest' "missing windows matrix entry"
|
|
||||||
check_pattern 'phase8_target:[[:space:]]+windows' "missing windows matrix target"
|
has_windows_os=0
|
||||||
|
has_windows_target=0
|
||||||
|
if grep -Eq 'os:[[:space:]]+windows-latest' "${workflow_file}"; then
|
||||||
|
has_windows_os=1
|
||||||
|
fi
|
||||||
|
if grep -Eq 'phase8_target:[[:space:]]+windows' "${workflow_file}"; then
|
||||||
|
has_windows_target=1
|
||||||
|
fi
|
||||||
|
if [[ ${has_windows_os} -ne ${has_windows_target} ]]; then
|
||||||
|
echo "Error: windows matrix entry and windows phase8 target must be added or removed together" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
echo "CI matrix shape checks passed"
|
echo "CI matrix shape checks passed"
|
||||||
|
|||||||
27
tests/ci_test/phase8_ci_targets.sh
Executable file
27
tests/ci_test/phase8_ci_targets.sh
Executable file
@@ -0,0 +1,27 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
phase8_target="${1:-}"
|
||||||
|
if [[ -z ${phase8_target} ]]; then
|
||||||
|
echo "Error: phase8 target required as first argument" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "${phase8_target}" in
|
||||||
|
linux-x64 | darwin-arm64)
|
||||||
|
printf '%s\n' "//tests/..."
|
||||||
|
;;
|
||||||
|
windows)
|
||||||
|
printf '%s\n' \
|
||||||
|
"//tests/binary_test/..." \
|
||||||
|
"//tests/bun_test_test/..." \
|
||||||
|
"//tests/ci_test/..." \
|
||||||
|
"//tests/js_compat_test/..." \
|
||||||
|
"//tests/script_test/..." \
|
||||||
|
"//tests/toolchain_test/..."
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Error: unsupported phase8 target: ${phase8_target}" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
44
tests/ci_test/phase8_ci_targets_test.sh
Executable file
44
tests/ci_test/phase8_ci_targets_test.sh
Executable file
@@ -0,0 +1,44 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
resolver="${1:-}"
|
||||||
|
if [[ -z ${resolver} ]]; then
|
||||||
|
echo "Error: resolver path required as first argument" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
linux_targets="$("${resolver}" linux-x64)"
|
||||||
|
if [[ ${linux_targets} != "//tests/..." ]]; then
|
||||||
|
echo "Error: linux-x64 should resolve to //tests/..." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
darwin_targets="$("${resolver}" darwin-arm64)"
|
||||||
|
if [[ ${darwin_targets} != "//tests/..." ]]; then
|
||||||
|
echo "Error: darwin-arm64 should resolve to //tests/..." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
windows_targets="$("${resolver}" windows)"
|
||||||
|
expected_windows_targets="$(
|
||||||
|
cat <<'EOF'
|
||||||
|
//tests/binary_test/...
|
||||||
|
//tests/bun_test_test/...
|
||||||
|
//tests/ci_test/...
|
||||||
|
//tests/js_compat_test/...
|
||||||
|
//tests/script_test/...
|
||||||
|
//tests/toolchain_test/...
|
||||||
|
EOF
|
||||||
|
)"
|
||||||
|
if [[ ${windows_targets} != "${expected_windows_targets}" ]]; then
|
||||||
|
echo "Error: unexpected windows targets" >&2
|
||||||
|
printf 'Expected:\n%s\nActual:\n%s\n' "${expected_windows_targets}" "${windows_targets}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if "${resolver}" unsupported >/dev/null 2>&1; then
|
||||||
|
echo "Error: unsupported phase8 target should fail" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Phase 8 CI targets resolve correctly"
|
||||||
@@ -32,6 +32,14 @@ config_setting(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
config_setting(
|
||||||
|
name = "windows_x86_64",
|
||||||
|
constraint_values = [
|
||||||
|
"@platforms//os:windows",
|
||||||
|
"@platforms//cpu:x86_64",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
sh_test(
|
sh_test(
|
||||||
name = "bun_install_clean_install_test",
|
name = "bun_install_clean_install_test",
|
||||||
size = "small",
|
size = "small",
|
||||||
@@ -41,6 +49,7 @@ sh_test(
|
|||||||
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
||||||
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
||||||
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
||||||
|
":windows_x86_64": ["$(location @bun_windows_x64//:bun)"],
|
||||||
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
||||||
}),
|
}),
|
||||||
data = select({
|
data = select({
|
||||||
@@ -48,6 +57,7 @@ sh_test(
|
|||||||
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
||||||
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
||||||
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
||||||
|
":windows_x86_64": ["@bun_windows_x64//:bun"],
|
||||||
"//conditions:default": ["@bun_linux_x64//:bun"],
|
"//conditions:default": ["@bun_linux_x64//:bun"],
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
@@ -61,6 +71,7 @@ sh_test(
|
|||||||
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
||||||
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
||||||
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
||||||
|
":windows_x86_64": ["$(location @bun_windows_x64//:bun)"],
|
||||||
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
||||||
}),
|
}),
|
||||||
data = select({
|
data = select({
|
||||||
@@ -68,6 +79,7 @@ sh_test(
|
|||||||
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
||||||
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
||||||
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
||||||
|
":windows_x86_64": ["@bun_windows_x64//:bun"],
|
||||||
"//conditions:default": ["@bun_linux_x64//:bun"],
|
"//conditions:default": ["@bun_linux_x64//:bun"],
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
@@ -97,6 +109,7 @@ sh_test(
|
|||||||
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
||||||
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
||||||
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
||||||
|
":windows_x86_64": ["$(location @bun_windows_x64//:bun)"],
|
||||||
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
||||||
}),
|
}),
|
||||||
data = select({
|
data = select({
|
||||||
@@ -104,6 +117,7 @@ sh_test(
|
|||||||
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
||||||
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
||||||
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
||||||
|
":windows_x86_64": ["@bun_windows_x64//:bun"],
|
||||||
"//conditions:default": ["@bun_linux_x64//:bun"],
|
"//conditions:default": ["@bun_linux_x64//:bun"],
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
@@ -117,6 +131,7 @@ sh_test(
|
|||||||
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
||||||
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
||||||
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
||||||
|
":windows_x86_64": ["$(location @bun_windows_x64//:bun)"],
|
||||||
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
||||||
}),
|
}),
|
||||||
data = select({
|
data = select({
|
||||||
@@ -124,18 +139,25 @@ sh_test(
|
|||||||
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
||||||
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
||||||
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
||||||
|
":windows_x86_64": ["@bun_windows_x64//:bun"],
|
||||||
"//conditions:default": ["@bun_linux_x64//:bun"],
|
"//conditions:default": ["@bun_linux_x64//:bun"],
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|
||||||
sh_test(
|
sh_test(
|
||||||
name = "bun_install_workspace_parity_test",
|
name = "bun_install_workspace_parity_test",
|
||||||
|
size = "large",
|
||||||
srcs = ["workspace_parity.sh"],
|
srcs = ["workspace_parity.sh"],
|
||||||
|
tags = [
|
||||||
|
"exclusive",
|
||||||
|
"no-sandbox",
|
||||||
|
],
|
||||||
args = select({
|
args = select({
|
||||||
":linux_x86_64": ["$(location @bun_linux_x64//:bun)"],
|
":linux_x86_64": ["$(location @bun_linux_x64//:bun)"],
|
||||||
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
||||||
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
||||||
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
||||||
|
":windows_x86_64": ["$(location @bun_windows_x64//:bun)"],
|
||||||
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
||||||
}),
|
}),
|
||||||
data = select({
|
data = select({
|
||||||
@@ -143,11 +165,13 @@ sh_test(
|
|||||||
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
||||||
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
||||||
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
||||||
|
":windows_x86_64": ["@bun_windows_x64//:bun"],
|
||||||
"//conditions:default": ["@bun_linux_x64//:bun"],
|
"//conditions:default": ["@bun_linux_x64//:bun"],
|
||||||
}) + [
|
}) + [
|
||||||
"//:repo_runtime_files",
|
"//:repo_runtime_files",
|
||||||
"//bun:repo_runtime_files",
|
"//bun:repo_runtime_files",
|
||||||
"//internal:repo_runtime_files",
|
"//internal:repo_runtime_files",
|
||||||
|
"//tests:nested_bazel_test.sh",
|
||||||
],
|
],
|
||||||
env_inherit = ["PATH"],
|
env_inherit = ["PATH"],
|
||||||
)
|
)
|
||||||
@@ -164,11 +188,16 @@ sh_test(
|
|||||||
name = "bun_install_repeatability_test",
|
name = "bun_install_repeatability_test",
|
||||||
size = "small",
|
size = "small",
|
||||||
srcs = ["repeatability.sh"],
|
srcs = ["repeatability.sh"],
|
||||||
|
tags = [
|
||||||
|
"exclusive",
|
||||||
|
"no-sandbox",
|
||||||
|
],
|
||||||
args = select({
|
args = select({
|
||||||
":linux_x86_64": ["$(location @bun_linux_x64//:bun)"],
|
":linux_x86_64": ["$(location @bun_linux_x64//:bun)"],
|
||||||
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
||||||
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
||||||
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
||||||
|
":windows_x86_64": ["$(location @bun_windows_x64//:bun)"],
|
||||||
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
||||||
}),
|
}),
|
||||||
data = select({
|
data = select({
|
||||||
@@ -176,11 +205,13 @@ sh_test(
|
|||||||
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
||||||
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
||||||
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
||||||
|
":windows_x86_64": ["@bun_windows_x64//:bun"],
|
||||||
"//conditions:default": ["@bun_linux_x64//:bun"],
|
"//conditions:default": ["@bun_linux_x64//:bun"],
|
||||||
}) + [
|
}) + [
|
||||||
"//:repo_runtime_files",
|
"//:repo_runtime_files",
|
||||||
"//bun:repo_runtime_files",
|
"//bun:repo_runtime_files",
|
||||||
"//internal:repo_runtime_files",
|
"//internal:repo_runtime_files",
|
||||||
|
"//tests:nested_bazel_test.sh",
|
||||||
],
|
],
|
||||||
env_inherit = ["PATH"],
|
env_inherit = ["PATH"],
|
||||||
)
|
)
|
||||||
@@ -189,11 +220,16 @@ sh_test(
|
|||||||
name = "bun_install_lifecycle_scripts_test",
|
name = "bun_install_lifecycle_scripts_test",
|
||||||
size = "small",
|
size = "small",
|
||||||
srcs = ["lifecycle_scripts.sh"],
|
srcs = ["lifecycle_scripts.sh"],
|
||||||
|
tags = [
|
||||||
|
"exclusive",
|
||||||
|
"no-sandbox",
|
||||||
|
],
|
||||||
args = select({
|
args = select({
|
||||||
":linux_x86_64": ["$(location @bun_linux_x64//:bun)"],
|
":linux_x86_64": ["$(location @bun_linux_x64//:bun)"],
|
||||||
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
||||||
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
||||||
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
||||||
|
":windows_x86_64": ["$(location @bun_windows_x64//:bun)"],
|
||||||
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
||||||
}),
|
}),
|
||||||
data = select({
|
data = select({
|
||||||
@@ -201,11 +237,13 @@ sh_test(
|
|||||||
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
||||||
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
||||||
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
||||||
|
":windows_x86_64": ["@bun_windows_x64//:bun"],
|
||||||
"//conditions:default": ["@bun_linux_x64//:bun"],
|
"//conditions:default": ["@bun_linux_x64//:bun"],
|
||||||
}) + [
|
}) + [
|
||||||
"//:repo_runtime_files",
|
"//:repo_runtime_files",
|
||||||
"//bun:repo_runtime_files",
|
"//bun:repo_runtime_files",
|
||||||
"//internal:repo_runtime_files",
|
"//internal:repo_runtime_files",
|
||||||
|
"//tests:nested_bazel_test.sh",
|
||||||
],
|
],
|
||||||
env_inherit = ["PATH"],
|
env_inherit = ["PATH"],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,22 +1,24 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
# shellcheck source=../nested_bazel_test.sh
|
||||||
|
source "${script_dir}/../nested_bazel_test.sh"
|
||||||
|
setup_nested_bazel_cmd
|
||||||
|
|
||||||
bun_path="$1"
|
bun_path="$1"
|
||||||
|
|
||||||
if command -v bazel >/dev/null 2>&1; then
|
rules_bun_root="$(find_nested_bazel_workspace_root "${BASH_SOURCE[0]}")"
|
||||||
bazel_cmd=(bazel)
|
|
||||||
elif command -v bazelisk >/dev/null 2>&1; then
|
|
||||||
bazel_cmd=(bazelisk)
|
|
||||||
else
|
|
||||||
echo "bazel or bazelisk is required on PATH" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
|
||||||
rules_bun_root="$(cd "${script_dir}/../.." && pwd -P)"
|
|
||||||
|
|
||||||
workdir="$(mktemp -d)"
|
workdir="$(mktemp -d)"
|
||||||
trap 'rm -rf "${workdir}"' EXIT
|
cleanup() {
|
||||||
|
local status="$1"
|
||||||
|
trap - EXIT
|
||||||
|
shutdown_nested_bazel_workspace "${fixture_dir:-}"
|
||||||
|
rm -rf "${workdir}"
|
||||||
|
exit "${status}"
|
||||||
|
}
|
||||||
|
trap 'cleanup $?' EXIT
|
||||||
|
|
||||||
fixture_dir="${workdir}/fixture"
|
fixture_dir="${workdir}/fixture"
|
||||||
mkdir -p "${fixture_dir}"
|
mkdir -p "${fixture_dir}"
|
||||||
|
|||||||
@@ -1,22 +1,24 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
# shellcheck source=../nested_bazel_test.sh
|
||||||
|
source "${script_dir}/../nested_bazel_test.sh"
|
||||||
|
setup_nested_bazel_cmd
|
||||||
|
|
||||||
bun_path="$1"
|
bun_path="$1"
|
||||||
|
|
||||||
if command -v bazel >/dev/null 2>&1; then
|
rules_bun_root="$(find_nested_bazel_workspace_root "${BASH_SOURCE[0]}")"
|
||||||
bazel_cmd=(bazel)
|
|
||||||
elif command -v bazelisk >/dev/null 2>&1; then
|
|
||||||
bazel_cmd=(bazelisk)
|
|
||||||
else
|
|
||||||
echo "bazel or bazelisk is required on PATH" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
|
||||||
rules_bun_root="$(cd "${script_dir}/../.." && pwd -P)"
|
|
||||||
|
|
||||||
workdir="$(mktemp -d)"
|
workdir="$(mktemp -d)"
|
||||||
trap 'rm -rf "${workdir}"' EXIT
|
cleanup() {
|
||||||
|
local status="$1"
|
||||||
|
trap - EXIT
|
||||||
|
shutdown_nested_bazel_workspace "${fixture_dir:-}"
|
||||||
|
rm -rf "${workdir}"
|
||||||
|
exit "${status}"
|
||||||
|
}
|
||||||
|
trap 'cleanup $?' EXIT
|
||||||
|
|
||||||
fixture_dir="${workdir}/fixture"
|
fixture_dir="${workdir}/fixture"
|
||||||
mkdir -p "${fixture_dir}"
|
mkdir -p "${fixture_dir}"
|
||||||
|
|||||||
@@ -1,22 +1,24 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
# shellcheck source=../nested_bazel_test.sh
|
||||||
|
source "${script_dir}/../nested_bazel_test.sh"
|
||||||
|
setup_nested_bazel_cmd
|
||||||
|
|
||||||
bun_path="${1:-bun}"
|
bun_path="${1:-bun}"
|
||||||
|
|
||||||
if command -v bazel >/dev/null 2>&1; then
|
rules_bun_root="$(find_nested_bazel_workspace_root "${BASH_SOURCE[0]}")"
|
||||||
bazel_cmd=(bazel)
|
|
||||||
elif command -v bazelisk >/dev/null 2>&1; then
|
|
||||||
bazel_cmd=(bazelisk)
|
|
||||||
else
|
|
||||||
echo "bazel or bazelisk is required on PATH" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
|
||||||
rules_bun_root="$(cd "${script_dir}/../.." && pwd -P)"
|
|
||||||
|
|
||||||
workdir="$(mktemp -d)"
|
workdir="$(mktemp -d)"
|
||||||
trap 'rm -rf "${workdir}"' EXIT
|
cleanup() {
|
||||||
|
local status="$1"
|
||||||
|
trap - EXIT
|
||||||
|
shutdown_nested_bazel_workspace "${bazel_dir:-}"
|
||||||
|
rm -rf "${workdir}"
|
||||||
|
exit "${status}"
|
||||||
|
}
|
||||||
|
trap 'cleanup $?' EXIT
|
||||||
|
|
||||||
fixture_dir="${workdir}/fixture"
|
fixture_dir="${workdir}/fixture"
|
||||||
plain_dir="${workdir}/plain"
|
plain_dir="${workdir}/plain"
|
||||||
|
|||||||
@@ -3,4 +3,6 @@ set -euo pipefail
|
|||||||
|
|
||||||
workflow_file="$1"
|
workflow_file="$1"
|
||||||
|
|
||||||
grep -Eq 'bazel test //(tests/)?\.\.\.' "${workflow_file}"
|
grep -Fq './tests/ci_test/phase8_ci_targets.sh "${{ matrix.phase8_target }}"' "${workflow_file}"
|
||||||
|
grep -Fq 'targets="$(./tests/ci_test/phase8_ci_targets.sh "${{ matrix.phase8_target }}")"' "${workflow_file}"
|
||||||
|
grep -Fq 'bazel test --test_output=errors ${targets}' "${workflow_file}"
|
||||||
|
|||||||
108
tests/nested_bazel_test.sh
Normal file
108
tests/nested_bazel_test.sh
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
setup_nested_bazel_cmd() {
|
||||||
|
local bazel_bin
|
||||||
|
local nested_bazel_base
|
||||||
|
local -a scrubbed_env_vars
|
||||||
|
|
||||||
|
if bazel_bin="$(command -v bazel 2>/dev/null)"; then
|
||||||
|
:
|
||||||
|
elif bazel_bin="$(command -v bazelisk 2>/dev/null)"; then
|
||||||
|
:
|
||||||
|
else
|
||||||
|
echo "bazel or bazelisk is required on PATH" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
nested_bazel_base="${TEST_TMPDIR:-${TMPDIR:-/tmp}}/rules_bun_nested_bazel"
|
||||||
|
mkdir -p "${nested_bazel_base}"
|
||||||
|
nested_bazel_root="$(mktemp -d "${nested_bazel_base}/session.XXXXXX")"
|
||||||
|
mkdir -p "${nested_bazel_root}/tmp"
|
||||||
|
|
||||||
|
scrubbed_env_vars=(
|
||||||
|
BAZEL_TEST
|
||||||
|
BUILD_EXECROOT
|
||||||
|
COVERAGE_DIR
|
||||||
|
GTEST_OUTPUT
|
||||||
|
GTEST_SHARD_INDEX
|
||||||
|
GTEST_SHARD_STATUS_FILE
|
||||||
|
GTEST_TMP_DIR
|
||||||
|
GTEST_TOTAL_SHARDS
|
||||||
|
JAVA_RUNFILES
|
||||||
|
PYTHON_RUNFILES
|
||||||
|
RUNFILES_DIR
|
||||||
|
RUNFILES_MANIFEST_FILE
|
||||||
|
RUNFILES_MANIFEST_ONLY
|
||||||
|
TEST_BINARY
|
||||||
|
TEST_INFRASTRUCTURE_FAILURE_FILE
|
||||||
|
TEST_LOGSPLITTER_OUTPUT_FILE
|
||||||
|
TEST_PREMATURE_EXIT_FILE
|
||||||
|
TEST_SHARD_INDEX
|
||||||
|
TEST_SHARD_STATUS_FILE
|
||||||
|
TEST_SRCDIR
|
||||||
|
TEST_TARGET
|
||||||
|
TEST_TMPDIR
|
||||||
|
TEST_TOTAL_SHARDS
|
||||||
|
TEST_UNDECLARED_OUTPUTS_ANNOTATIONS
|
||||||
|
TEST_UNDECLARED_OUTPUTS_ANNOTATIONS_DIR
|
||||||
|
TEST_UNDECLARED_OUTPUTS_DIR
|
||||||
|
TEST_UNDECLARED_OUTPUTS_MANIFEST
|
||||||
|
TEST_UNDECLARED_OUTPUTS_ZIP
|
||||||
|
TEST_UNUSED_RUNFILES_LOG_FILE
|
||||||
|
TEST_WARNINGS_OUTPUT_FILE
|
||||||
|
XML_OUTPUT_FILE
|
||||||
|
)
|
||||||
|
|
||||||
|
nested_bazel_env=(env)
|
||||||
|
for env_var in "${scrubbed_env_vars[@]}"; do
|
||||||
|
nested_bazel_env+=("-u" "${env_var}")
|
||||||
|
done
|
||||||
|
nested_bazel_env+=("TMPDIR=${nested_bazel_root}/tmp")
|
||||||
|
|
||||||
|
bazel_cmd=(
|
||||||
|
"${nested_bazel_env[@]}"
|
||||||
|
"${bazel_bin}"
|
||||||
|
"--batch"
|
||||||
|
"--ignore_all_rc_files"
|
||||||
|
"--output_user_root=${nested_bazel_root}/output_user_root"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
find_nested_bazel_workspace_root() {
|
||||||
|
local script_path="${1:-${BASH_SOURCE[0]}}"
|
||||||
|
local candidate
|
||||||
|
local script_dir
|
||||||
|
|
||||||
|
for candidate in \
|
||||||
|
"${TEST_SRCDIR:-}/${TEST_WORKSPACE:-}" \
|
||||||
|
"${TEST_SRCDIR:-}/_main"; do
|
||||||
|
if [[ -n ${candidate} && -f "${candidate}/MODULE.bazel" ]]; then
|
||||||
|
printf '%s\n' "${candidate}"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
script_dir="$(cd "$(dirname "${script_path}")" && pwd -P)"
|
||||||
|
candidate="$(cd "${script_dir}/../.." && pwd -P)"
|
||||||
|
if [[ -f "${candidate}/MODULE.bazel" ]]; then
|
||||||
|
printf '%s\n' "${candidate}"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Unable to locate rules_bun workspace root" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
shutdown_nested_bazel_workspace() {
|
||||||
|
local workspace_dir="${1:-}"
|
||||||
|
if [[ -n ${workspace_dir} && -d ${workspace_dir} ]]; then
|
||||||
|
(
|
||||||
|
cd "${workspace_dir}"
|
||||||
|
"${bazel_cmd[@]}" shutdown >/dev/null 2>&1
|
||||||
|
) || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n ${nested_bazel_root:-} && -d ${nested_bazel_root} ]]; then
|
||||||
|
rm -rf "${nested_bazel_root}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
@@ -32,15 +32,28 @@ config_setting(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
config_setting(
|
||||||
|
name = "windows_x86_64",
|
||||||
|
constraint_values = [
|
||||||
|
"@platforms//os:windows",
|
||||||
|
"@platforms//cpu:x86_64",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
sh_test(
|
sh_test(
|
||||||
name = "npm_translate_lock_workspace_test",
|
name = "npm_translate_lock_workspace_test",
|
||||||
size = "small",
|
size = "small",
|
||||||
srcs = ["npm_translate_lock_workspace_test.sh"],
|
srcs = ["npm_translate_lock_workspace_test.sh"],
|
||||||
|
tags = [
|
||||||
|
"exclusive",
|
||||||
|
"no-sandbox",
|
||||||
|
],
|
||||||
args = select({
|
args = select({
|
||||||
":linux_x86_64": ["$(location @bun_linux_x64//:bun)"],
|
":linux_x86_64": ["$(location @bun_linux_x64//:bun)"],
|
||||||
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
||||||
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
||||||
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
||||||
|
":windows_x86_64": ["$(location @bun_windows_x64//:bun)"],
|
||||||
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
||||||
}),
|
}),
|
||||||
data = select({
|
data = select({
|
||||||
@@ -48,6 +61,7 @@ sh_test(
|
|||||||
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
||||||
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
||||||
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
||||||
|
":windows_x86_64": ["@bun_windows_x64//:bun"],
|
||||||
"//conditions:default": ["@bun_linux_x64//:bun"],
|
"//conditions:default": ["@bun_linux_x64//:bun"],
|
||||||
}) + [
|
}) + [
|
||||||
"//:repo_runtime_files",
|
"//:repo_runtime_files",
|
||||||
@@ -55,6 +69,7 @@ sh_test(
|
|||||||
"//internal:repo_runtime_files",
|
"//internal:repo_runtime_files",
|
||||||
"//js:repo_runtime_files",
|
"//js:repo_runtime_files",
|
||||||
"//npm:repo_runtime_files",
|
"//npm:repo_runtime_files",
|
||||||
|
"//tests:nested_bazel_test.sh",
|
||||||
],
|
],
|
||||||
env_inherit = ["PATH"],
|
env_inherit = ["PATH"],
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,22 +1,24 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
if command -v bazel >/dev/null 2>&1; then
|
|
||||||
bazel_bin="$(command -v bazel)"
|
|
||||||
elif command -v bazelisk >/dev/null 2>&1; then
|
|
||||||
bazel_bin="$(command -v bazelisk)"
|
|
||||||
else
|
|
||||||
echo "bazel or bazelisk is required on PATH" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
bun_path="${1:-bun}"
|
bun_path="${1:-bun}"
|
||||||
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
rules_bun_root="$(cd "${script_dir}/../.." && pwd -P)"
|
# shellcheck source=../nested_bazel_test.sh
|
||||||
|
source "${script_dir}/../nested_bazel_test.sh"
|
||||||
|
setup_nested_bazel_cmd
|
||||||
|
|
||||||
|
rules_bun_root="$(find_nested_bazel_workspace_root "${BASH_SOURCE[0]}")"
|
||||||
|
|
||||||
workdir="$(mktemp -d)"
|
workdir="$(mktemp -d)"
|
||||||
trap 'rm -rf "${workdir}"' EXIT
|
cleanup() {
|
||||||
|
local status="$1"
|
||||||
|
trap - EXIT
|
||||||
|
shutdown_nested_bazel_workspace "${fixture_dir:-}"
|
||||||
|
rm -rf "${workdir}"
|
||||||
|
exit "${status}"
|
||||||
|
}
|
||||||
|
trap 'cleanup $?' EXIT
|
||||||
|
|
||||||
fixture_dir="${workdir}/fixture"
|
fixture_dir="${workdir}/fixture"
|
||||||
mkdir -p "${fixture_dir}"
|
mkdir -p "${fixture_dir}"
|
||||||
@@ -100,7 +102,7 @@ EOF
|
|||||||
|
|
||||||
output="$(
|
output="$(
|
||||||
cd "${fixture_dir}" &&
|
cd "${fixture_dir}" &&
|
||||||
"${bazel_bin}" run //:app
|
"${bazel_cmd[@]}" run //:app
|
||||||
)"
|
)"
|
||||||
|
|
||||||
if [[ ${output} != *"compat:true"* ]]; then
|
if [[ ${output} != *"compat:true"* ]]; then
|
||||||
@@ -110,7 +112,7 @@ fi
|
|||||||
|
|
||||||
query_output="$(
|
query_output="$(
|
||||||
cd "${fixture_dir}" &&
|
cd "${fixture_dir}" &&
|
||||||
"${bazel_bin}" query //:npm__is_number
|
"${bazel_cmd[@]}" query //:npm__is_number
|
||||||
)"
|
)"
|
||||||
if ! grep -Fxq "//:npm__is_number" <<<"${query_output}"; then
|
if ! grep -Fxq "//:npm__is_number" <<<"${query_output}"; then
|
||||||
echo "expected npm_link_all_packages to create //:npm__is_number" >&2
|
echo "expected npm_link_all_packages to create //:npm__is_number" >&2
|
||||||
|
|||||||
@@ -32,6 +32,14 @@ config_setting(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
config_setting(
|
||||||
|
name = "windows_x86_64",
|
||||||
|
constraint_values = [
|
||||||
|
"@platforms//os:windows",
|
||||||
|
"@platforms//cpu:x86_64",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
sh_test(
|
sh_test(
|
||||||
name = "bun_version_test",
|
name = "bun_version_test",
|
||||||
size = "small",
|
size = "small",
|
||||||
@@ -41,6 +49,7 @@ sh_test(
|
|||||||
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
":linux_aarch64": ["$(location @bun_linux_aarch64//:bun)"],
|
||||||
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
":darwin_x86_64": ["$(location @bun_darwin_x64//:bun)"],
|
||||||
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
":darwin_aarch64": ["$(location @bun_darwin_aarch64//:bun)"],
|
||||||
|
":windows_x86_64": ["$(location @bun_windows_x64//:bun)"],
|
||||||
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
"//conditions:default": ["$(location @bun_linux_x64//:bun)"],
|
||||||
}),
|
}),
|
||||||
data = select({
|
data = select({
|
||||||
@@ -48,6 +57,7 @@ sh_test(
|
|||||||
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
":linux_aarch64": ["@bun_linux_aarch64//:bun"],
|
||||||
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
":darwin_x86_64": ["@bun_darwin_x64//:bun"],
|
||||||
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
":darwin_aarch64": ["@bun_darwin_aarch64//:bun"],
|
||||||
|
":windows_x86_64": ["@bun_windows_x64//:bun"],
|
||||||
"//conditions:default": ["@bun_linux_x64//:bun"],
|
"//conditions:default": ["@bun_linux_x64//:bun"],
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user