Skip to content

Commit 190efba

Browse files
authored
Merge branch 'main' into bindgen-windows
2 parents f9c352d + e226874 commit 190efba

3,018 files changed

Lines changed: 187590 additions & 91719 deletions

File tree

Some content is hidden

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

.bazelci/presubmit.yml

Lines changed: 295 additions & 180 deletions
Large diffs are not rendered by default.

.bazelrc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ build --nobuild_runfile_links
1111
# https://bazel.build/reference/command-line-reference#flag--enable_platform_specific_config
1212
common --enable_platform_specific_config
1313

14-
# https://bazel.build/docs/windows#symlink
15-
startup --windows_enable_symlinks
16-
build:windows --enable_runfiles
17-
1814
# Enable the only currently supported report type
1915
# https://bazel.build/reference/command-line-reference#flag--combined_report
2016
coverage --combined_report=lcov
@@ -27,6 +23,9 @@ coverage --experimental_fetch_all_coverage_outputs
2723
# https://bazel.build/reference/command-line-reference#flag--experimental_cc_shared_library
2824
common --experimental_cc_shared_library
2925

26+
# Disable network access in sandboxes by default.
27+
build --sandbox_default_allow_network=false
28+
3029
###############################################################################
3130
## Unique configuration groups
3231
###############################################################################
@@ -50,6 +49,10 @@ build:unpretty --output_groups=+rust_unpretty
5049
# https://github.com/rust-lang/rust/issues/43364
5150
build:unpretty --config=nightly
5251

52+
# Disable cc toolchains to test rust targets can be built without one.
53+
build:no_cc_toolchain --repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
54+
build:no_cc_toolchain --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1
55+
5356
###############################################################################
5457
## Incompatibility flags
5558
###############################################################################
@@ -60,9 +63,6 @@ build --incompatible_disallow_empty_glob=true
6063
# https://github.com/bazelbuild/bazel/issues/12821
6164
build --nolegacy_external_runfiles
6265

63-
# Required for cargo_build_script support before Bazel 7
64-
build --incompatible_merge_fixed_and_default_shell_env
65-
6666
# https://github.com/bazelbuild/bazel/issues/23043.
6767
build --incompatible_autoload_externally=
6868

.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8.4.2

.bcr/config.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
fixedReleaser:
2-
login: scentini
3-
email: 11149636+scentini@users.noreply.github.com
41
moduleRoots:
52
- "."
63
- "extensions/bindgen"
74
- "extensions/mdbook"
85
- "extensions/prost"
96
- "extensions/protobuf"
7+
- "extensions/pyo3"
108
- "extensions/wasm_bindgen"
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",
3+
"maintainers": [
4+
{
5+
"email": "26427366+UebelAndre@users.noreply.github.com",
6+
"github": "UebelAndre",
7+
"name": "UebelAndre"
8+
},
9+
{
10+
"email": "1131704+illicitonion@users.noreply.github.com",
11+
"github": "illicitonion",
12+
"name": "Daniel Wagner-Hall"
13+
},
14+
{
15+
"email": "11149636+scentini@users.noreply.github.com",
16+
"github": "scentini",
17+
"name": "Rosica Dejanovska"
18+
}
19+
],
20+
"repository": ["github:bazelbuild/rules_rust"],
21+
"versions": [],
22+
"yanked_versions": {}
23+
}

.bcr/extensions/pyo3/presubmit.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
bcr_test_module:
2+
module_path: ""
3+
matrix:
4+
platform: ["macos_arm64", "ubuntu2004", "windows"]
5+
bazel: ["7.x", "8.x"]
6+
tasks:
7+
run_tests:
8+
name: "Run test module"
9+
platform: ${{ platform }}
10+
bazel: ${{ bazel }}
11+
test_targets:
12+
- "//..."
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": "extensions/pyo3",
4+
"url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}-{VERSION}.tar.gz"
5+
}

.bcr/metadata.template.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,27 @@
22
"homepage": "https://github.com/bazelbuild/rules_rust",
33
"maintainers": [
44
{
5-
"email": "26427366+UebelAndre@users.noreply.github.com",
6-
"github": "UebelAndre",
7-
"name": "UebelAndre"
5+
"email": "26427366+UebelAndre@users.noreply.github.com",
6+
"github": "UebelAndre",
7+
"github_user_id": 26427366,
8+
"name": "UebelAndre"
89
},
910
{
1011
"email": "1131704+illicitonion@users.noreply.github.com",
1112
"github": "illicitonion",
13+
"github_user_id": 1131704,
1214
"name": "Daniel Wagner-Hall"
1315
},
1416
{
1517
"email": "11149636+scentini@users.noreply.github.com",
1618
"github": "scentini",
19+
"github_user_id": 11149636,
1720
"name": "Rosica Dejanovska"
1821
}
1922
],
20-
"repository": ["github:bazelbuild/rules_rust"],
23+
"repository": [
24+
"github:bazelbuild/rules_rust"
25+
],
2126
"versions": [],
2227
"yanked_versions": {}
2328
}

.github/github.bazelrc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
# Always display the flags being used
44
common --announce_rc
55

6-
# These settings make the windows workers behave similarly to unix workers
7-
startup --windows_enable_symlinks
8-
build --enable_runfiles
9-
106
# Show errors in CI
117
test --test_output=errors
128

.github/release_notes.template

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ http_archive(
103103

104104
```python
105105
bazel_dep(name = "rules_rust_protobuf", version = "{version}")
106+
107+
register_toolchains(
108+
"@rules_rust_pyo3//toolchains:toolchain",
109+
"@rules_rust_pyo3//toolchains:rust_toolchain",
110+
)
106111
```
107112

108113
#### WORKSPACE
@@ -119,6 +124,16 @@ http_archive(
119124

120125
</details>
121126

127+
### PyO3
128+
129+
<details>
130+
131+
```python
132+
bazel_dep(name = "rules_rust_pyo3", version = "{version}")
133+
```
134+
135+
</details>
136+
122137
### Wasm-Bindgen
123138

124139
<details>

0 commit comments

Comments
 (0)