Skip to content

Commit 21ceb8b

Browse files
UebelAndreUebelAndre
committed
Split rules_rust_ext into granular sub-workspaces.
1 parent 02a73bc commit 21ceb8b

File tree

580 files changed

+5410
-4238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

580 files changed

+5410
-4238
lines changed

‎.bazelci/presubmit.yml‎

Lines changed: 101 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -824,20 +824,20 @@ tasks:
824824
- "--compile_one_dependency"
825825
build_targets:
826826
- "tools/rust_analyzer/main.rs"
827-
extensions_linux:
828-
name: Extensions
827+
extensions_bindgen_linux:
829828
platform: ubuntu2004
830-
working_directory: extensions
829+
name: Extensions Bindgen
830+
working_directory: extensions/bindgen
831831
build_flags: *aspects_flags
832832
test_flags: *aspects_flags
833833
build_targets:
834834
- "//..."
835835
test_targets:
836836
- "//..."
837-
extensions_linux_rbe:
838-
name: Extensions
837+
extensions_bindgen_linux_rbe:
839838
platform: rbe_ubuntu2004
840-
working_directory: extensions
839+
name: Extensions Bindgen
840+
working_directory: extensions/bindgen
841841
shell_commands:
842842
- sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
843843
- sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
@@ -847,34 +847,116 @@ tasks:
847847
- "//..."
848848
test_targets:
849849
- "//..."
850-
extensions_macos:
851-
name: Extensions
850+
extensions_bindgen_macos:
852851
platform: macos_arm64
853-
working_directory: extensions
852+
name: Extensions Bindgen
853+
working_directory: extensions/bindgen
854854
build_flags: *aspects_flags
855855
test_flags: *aspects_flags
856856
build_targets:
857857
- "//..."
858858
test_targets:
859859
- "//..."
860-
extensions_windows:
861-
name: Extensions
860+
# # TODO: https://github.com/bazelbuild/rules_rust/issues/2009
861+
# # The bindgen rules are currently broken on windows
862+
# extensions_bindgen_windows:
863+
# platform: windows
864+
# name: Extensions Bindgen
865+
# working_directory: extensions/bindgen
866+
# build_flags: *aspects_flags
867+
# test_flags: *aspects_flags
868+
# build_targets:
869+
# - "--"
870+
# - "//..."
871+
# test_targets:
872+
# - "--"
873+
# - "//..."
874+
extensions_protobuf_linux:
875+
platform: ubuntu2004
876+
name: Extensions Protobuf
877+
working_directory: extensions/protobuf
878+
build_flags: *aspects_flags
879+
test_flags: *aspects_flags
880+
build_targets:
881+
- "//..."
882+
test_targets:
883+
- "//..."
884+
extensions_protobuf_linux_rbe:
885+
platform: rbe_ubuntu2004
886+
name: Extensions Protobuf
887+
working_directory: extensions/protobuf
888+
shell_commands:
889+
- sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
890+
- sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
891+
build_flags: *aspects_flags
892+
test_flags: *aspects_flags
893+
build_targets:
894+
- "//..."
895+
test_targets:
896+
- "//..."
897+
extensions_protobuf_macos:
898+
platform: macos_arm64
899+
name: Extensions Protobuf
900+
working_directory: extensions/protobuf
901+
build_flags: *aspects_flags
902+
test_flags: *aspects_flags
903+
build_targets:
904+
- "//..."
905+
test_targets:
906+
- "//..."
907+
extensions_protobuf_windows:
862908
platform: windows
909+
name: Extensions Protobuf
910+
working_directory: extensions/protobuf
911+
build_flags: *aspects_flags
912+
test_flags: *aspects_flags
913+
build_targets:
914+
- "//..."
915+
test_targets:
916+
- "//..."
917+
extensions_wasm_bindgen_linux:
918+
platform: ubuntu2004
919+
name: Extensions wasm-bindgen
920+
working_directory: extensions/wasm_bindgen
921+
build_flags: *aspects_flags
922+
test_flags: *aspects_flags
923+
build_targets:
924+
- "//..."
925+
test_targets:
926+
- "//..."
927+
extensions_wasm_bindgen_linux_rbe:
928+
platform: rbe_ubuntu2004
929+
name: Extensions wasm-bindgen
930+
working_directory: extensions/wasm_bindgen
931+
shell_commands:
932+
- sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
933+
- sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
934+
build_flags: *aspects_flags
935+
test_flags: *aspects_flags
936+
build_targets:
937+
- "//..."
938+
test_targets:
939+
- "//..."
940+
extensions_wasm_bindgen_macos:
941+
platform: macos_arm64
942+
name: Extensions wasm-bindgen
863943
working_directory: extensions
864944
build_flags: *aspects_flags
865945
test_flags: *aspects_flags
866946
build_targets:
867-
- "--"
868947
- "//..."
869-
# The bindgen rules are currently broken on windows
870-
# https://github.com/bazelbuild/rules_rust/issues/2009
871-
- "-//bindgen/..."
872948
test_targets:
873-
- "--"
874949
- "//..."
875-
# The bindgen rules are currently broken on windows
876-
# https://github.com/bazelbuild/rules_rust/issues/2009
877-
- "-//bindgen/..."
950+
extensions_wasm_bindgen_windows:
951+
platform: windows
952+
name: Extensions wasm-bindgen
953+
working_directory: extensions/wasm_bindgen
954+
build_flags: *aspects_flags
955+
test_flags: *aspects_flags
956+
build_targets:
957+
- "//..."
958+
test_targets:
959+
- "//..."
878960

879961
buildifier:
880962
version: latest

‎.bcr/extensions/bindgen/metadata.template.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"homepage": "https://github.com/bazelbuild/rules_rust/extensions/bindgen",
3+
"maintainers": [
4+
{
5+
"email": "[email protected]",
6+
"github": "UebelAndre",
7+
"name": "UebelAndre"
8+
},
9+
{
10+
"email": "[email protected]",
11+
"github": "illicitonion",
12+
"name": "Daniel Wagner-Hall"
13+
},
14+
{
15+
"email": "[email protected]",
16+
"github": "scentini",
17+
"name": "Rosica Dejanovska"
18+
}
19+
],
20+
"repository": ["github:bazelbuild/rules_rust"],
21+
"versions": [],
22+
"yanked_versions": {}
23+
}

‎.bcr/extensions/bindgen/presubmit.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
bcr_test_module:
2+
module_path: "extensions/bindgen"
3+
matrix:
4+
platform: ["macos_arm64", "ubuntu2004", "windows"]
5+
bazel: ["7.x"]
6+
tasks:
7+
run_tests:
8+
name: "Run test module"
9+
platform: ${{ platform }}
10+
bazel: ${{ bazel }}
11+
# Remove the lockfile because we generate on Bazel 7, but test on Bazel 6 which may not be able to parse a future-generated lockfile.
12+
shell_commands:
13+
- "rm MODULE.bazel.lock"
14+
test_targets:
15+
- "//..."

‎.bcr/extensions/bindgen/source.template.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"integrity": "**leave this alone**",
3+
"strip_prefix": "",
4+
"url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}_bindgen-{VERSION}.tar.gz"
5+
}

‎.bcr/extensions/metadata.template.json‎ renamed to ‎.bcr/extensions/prost/metadata.template.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"homepage": "https://github.com/bazelbuild/rules_rust/extensions",
2+
"homepage": "https://github.com/bazelbuild/rules_rust/extensions/prost",
33
"maintainers": [
44
{
55
"email": "[email protected]",

‎.bcr/extensions/presubmit.yml‎ renamed to ‎.bcr/extensions/prost/presubmit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
bcr_test_module:
2-
module_path: "extensions"
2+
module_path: "extensions/prost"
33
matrix:
44
platform: ["macos_arm64", "ubuntu2004", "windows"]
55
bazel: ["7.x"]

‎.bcr/extensions/source.template.json‎ renamed to ‎.bcr/extensions/prost/source.template.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"integrity": "**leave this alone**",
33
"strip_prefix": "",
4-
"url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}_ext-{VERSION}.tar.gz"
4+
"url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}_prost-{VERSION}.tar.gz"
55
}

‎.bcr/extensions/protobuf/metadata.template.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"homepage": "https://github.com/bazelbuild/rules_rust/extensions/protobuf",
3+
"maintainers": [
4+
{
5+
"email": "[email protected]",
6+
"github": "UebelAndre",
7+
"name": "UebelAndre"
8+
},
9+
{
10+
"email": "[email protected]",
11+
"github": "illicitonion",
12+
"name": "Daniel Wagner-Hall"
13+
},
14+
{
15+
"email": "[email protected]",
16+
"github": "scentini",
17+
"name": "Rosica Dejanovska"
18+
}
19+
],
20+
"repository": ["github:bazelbuild/rules_rust"],
21+
"versions": [],
22+
"yanked_versions": {}
23+
}

‎.bcr/extensions/protobuf/presubmit.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
bcr_test_module:
2+
module_path: "extensions/protobuf"
3+
matrix:
4+
platform: ["macos_arm64", "ubuntu2004", "windows"]
5+
bazel: ["7.x"]
6+
tasks:
7+
run_tests:
8+
name: "Run test module"
9+
platform: ${{ platform }}
10+
bazel: ${{ bazel }}
11+
# Remove the lockfile because we generate on Bazel 7, but test on Bazel 6 which may not be able to parse a future-generated lockfile.
12+
shell_commands:
13+
- "rm MODULE.bazel.lock"
14+
test_targets:
15+
- "//..."

‎.bcr/extensions/protobuf/source.template.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"integrity": "**leave this alone**",
3+
"strip_prefix": "",
4+
"url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}_protobuf-{VERSION}.tar.gz"
5+
}

0 commit comments

Comments
 (0)