Skip to content

Commit d267cb1

Browse files
committed
Merge branch 'main' into dcreager/specialize-deepish
* main: disable jemalloc on android (#18033) [ty] Fix incorrect type of `src.root` in documentation (#18040) [ty] Refine message for why a rule is enabled (#18038) [ty] Remove brackets around option names (#18037) Update pre-commit dependencies (#18025) Update docker/build-push-action action to v6.16.0 (#18030) Update docker/login-action action to v3.4.0 (#18031) Update taiki-e/install-action digest to 83254c5 (#18022) Update cargo-bins/cargo-binstall action to v1.12.4 (#18023) Update Rust crate ctrlc to v3.4.7 (#18027) Update Rust crate clap to v4.5.38 (#18026) Update Rust crate jiff to v0.2.13 (#18029) Update Rust crate getrandom to v0.3.3 (#18028) Update dependency ruff to v0.11.9 (#18024) [`pylint`] add fix safety section (`PLW1514`) (#17932) python_stdlib: update for 3.14 (#18014) [`ruff`] add fix safety section (`RUF033`) (#17760) [`pylint`] add fix safety section (`PLC0414`) (#17802)
2 parents 067b52f + 797eb70 commit d267cb1

107 files changed

Lines changed: 341 additions & 252 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.

.github/workflows/build-docker.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
4242

43-
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
43+
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
4444
with:
4545
registry: ghcr.io
4646
username: ${{ github.repository_owner }}
@@ -79,7 +79,7 @@ jobs:
7979
# Adapted from https://docs.docker.com/build/ci/github-actions/multi-platform/
8080
- name: Build and push by digest
8181
id: build
82-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
82+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
8383
with:
8484
context: .
8585
platforms: ${{ matrix.platform }}
@@ -131,7 +131,7 @@ jobs:
131131
type=pep440,pattern={{ version }},value=${{ fromJson(inputs.plan).announcement_tag }}
132132
type=pep440,pattern={{ major }}.{{ minor }},value=${{ fromJson(inputs.plan).announcement_tag }}
133133
134-
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
134+
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
135135
with:
136136
registry: ghcr.io
137137
username: ${{ github.repository_owner }}
@@ -169,7 +169,7 @@ jobs:
169169
steps:
170170
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
171171

172-
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
172+
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
173173
with:
174174
registry: ghcr.io
175175
username: ${{ github.repository_owner }}
@@ -231,7 +231,7 @@ jobs:
231231
${{ env.TAG_PATTERNS }}
232232
233233
- name: Build and push
234-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
234+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
235235
with:
236236
context: .
237237
platforms: linux/amd64,linux/arm64
@@ -276,7 +276,7 @@ jobs:
276276
type=pep440,pattern={{ version }},value=${{ fromJson(inputs.plan).announcement_tag }}
277277
type=pep440,pattern={{ major }}.{{ minor }},value=${{ fromJson(inputs.plan).announcement_tag }}
278278
279-
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
279+
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
280280
with:
281281
registry: ghcr.io
282282
username: ${{ github.repository_owner }}

.github/workflows/ci.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,11 @@ jobs:
239239
- name: "Install mold"
240240
uses: rui314/setup-mold@e16410e7f8d9e167b74ad5697a9089a35126eb50 # v1
241241
- name: "Install cargo nextest"
242-
uses: taiki-e/install-action@86c23eed46c17b80677df6d8151545ce3e236c61 # v2
242+
uses: taiki-e/install-action@83254c543806f3224380bf1001d6fac8feaf2d0b # v2
243243
with:
244244
tool: cargo-nextest
245245
- name: "Install cargo insta"
246-
uses: taiki-e/install-action@86c23eed46c17b80677df6d8151545ce3e236c61 # v2
246+
uses: taiki-e/install-action@83254c543806f3224380bf1001d6fac8feaf2d0b # v2
247247
with:
248248
tool: cargo-insta
249249
- name: ty mdtests (GitHub annotations)
@@ -297,11 +297,11 @@ jobs:
297297
- name: "Install mold"
298298
uses: rui314/setup-mold@e16410e7f8d9e167b74ad5697a9089a35126eb50 # v1
299299
- name: "Install cargo nextest"
300-
uses: taiki-e/install-action@86c23eed46c17b80677df6d8151545ce3e236c61 # v2
300+
uses: taiki-e/install-action@83254c543806f3224380bf1001d6fac8feaf2d0b # v2
301301
with:
302302
tool: cargo-nextest
303303
- name: "Install cargo insta"
304-
uses: taiki-e/install-action@86c23eed46c17b80677df6d8151545ce3e236c61 # v2
304+
uses: taiki-e/install-action@83254c543806f3224380bf1001d6fac8feaf2d0b # v2
305305
with:
306306
tool: cargo-insta
307307
- name: "Run tests"
@@ -324,7 +324,7 @@ jobs:
324324
- name: "Install Rust toolchain"
325325
run: rustup show
326326
- name: "Install cargo nextest"
327-
uses: taiki-e/install-action@86c23eed46c17b80677df6d8151545ce3e236c61 # v2
327+
uses: taiki-e/install-action@83254c543806f3224380bf1001d6fac8feaf2d0b # v2
328328
with:
329329
tool: cargo-nextest
330330
- name: "Run tests"
@@ -407,11 +407,11 @@ jobs:
407407
- name: "Install mold"
408408
uses: rui314/setup-mold@e16410e7f8d9e167b74ad5697a9089a35126eb50 # v1
409409
- name: "Install cargo nextest"
410-
uses: taiki-e/install-action@86c23eed46c17b80677df6d8151545ce3e236c61 # v2
410+
uses: taiki-e/install-action@83254c543806f3224380bf1001d6fac8feaf2d0b # v2
411411
with:
412412
tool: cargo-nextest
413413
- name: "Install cargo insta"
414-
uses: taiki-e/install-action@86c23eed46c17b80677df6d8151545ce3e236c61 # v2
414+
uses: taiki-e/install-action@83254c543806f3224380bf1001d6fac8feaf2d0b # v2
415415
with:
416416
tool: cargo-insta
417417
- name: "Run tests"
@@ -437,7 +437,7 @@ jobs:
437437
- name: "Install Rust toolchain"
438438
run: rustup show
439439
- name: "Install cargo-binstall"
440-
uses: cargo-bins/cargo-binstall@63aaa5c1932cebabc34eceda9d92a70215dcead6 # v1.12.3
440+
uses: cargo-bins/cargo-binstall@13f9d60d5358393bf14644dba56d9f123bc5d595 # v1.12.4
441441
with:
442442
tool: cargo-fuzz@0.11.2
443443
- name: "Install cargo-fuzz"
@@ -692,7 +692,7 @@ jobs:
692692
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
693693
with:
694694
persist-credentials: false
695-
- uses: cargo-bins/cargo-binstall@63aaa5c1932cebabc34eceda9d92a70215dcead6 # v1.12.3
695+
- uses: cargo-bins/cargo-binstall@13f9d60d5358393bf14644dba56d9f123bc5d595 # v1.12.4
696696
- run: cargo binstall --no-confirm cargo-shear
697697
- run: cargo shear
698698

@@ -908,7 +908,7 @@ jobs:
908908
run: rustup show
909909

910910
- name: "Install codspeed"
911-
uses: taiki-e/install-action@86c23eed46c17b80677df6d8151545ce3e236c61 # v2
911+
uses: taiki-e/install-action@83254c543806f3224380bf1001d6fac8feaf2d0b # v2
912912
with:
913913
tool: cargo-codspeed
914914

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ repos:
8080
pass_filenames: false # This makes it a lot faster
8181

8282
- repo: https://github.com/astral-sh/ruff-pre-commit
83-
rev: v0.11.8
83+
rev: v0.11.9
8484
hooks:
8585
- id: ruff-format
8686
- id: ruff
@@ -98,7 +98,7 @@ repos:
9898
# zizmor detects security vulnerabilities in GitHub Actions workflows.
9999
# Additional configuration for the tool is found in `.github/zizmor.yml`
100100
- repo: https://github.com/woodruffw/zizmor-pre-commit
101-
rev: v1.6.0
101+
rev: v1.7.0
102102
hooks:
103103
- id: zizmor
104104

Cargo.lock

Lines changed: 40 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/ruff/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ dist = true
8484
[target.'cfg(target_os = "windows")'.dependencies]
8585
mimalloc = { workspace = true }
8686

87-
[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dependencies]
87+
[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), not(target_os = "aix"), not(target_os = "android"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64")))'.dependencies]
8888
tikv-jemallocator = { workspace = true }
8989

9090
[lints]

crates/ruff/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
1515
not(target_os = "windows"),
1616
not(target_os = "openbsd"),
1717
not(target_os = "aix"),
18+
not(target_os = "android"),
1819
any(
1920
target_arch = "x86_64",
2021
target_arch = "aarch64",

0 commit comments

Comments
 (0)