Skip to content

Commit 1fa64a2

Browse files
authored
Revert "[ruff]: Build loongarch64 binaries in CI (#20361)" (#20372)
1 parent 1745554 commit 1fa64a2

File tree

10 files changed

+10
-27
lines changed

10 files changed

+10
-27
lines changed

.github/workflows/build-binaries.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,6 @@ jobs:
294294
arch: arm
295295
- target: riscv64gc-unknown-linux-gnu
296296
arch: riscv64
297-
- target: loongarch64-unknown-linux-gnu
298-
arch: loong64
299-
# There's currently no loong64 support for Ubuntu so we are using Debian
300-
base_image: --platform=linux/loong64 ghcr.io/loong64/debian:trixie
301-
maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16
302297

303298
steps:
304299
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -323,15 +318,12 @@ jobs:
323318
with:
324319
arch: ${{ matrix.platform.arch == 'arm' && 'armv6' || matrix.platform.arch }}
325320
distro: ${{ matrix.platform.arch == 'arm' && 'bullseye' || 'ubuntu20.04' }}
326-
base_image: ${{ matrix.platform.base_image }}
327321
githubToken: ${{ github.token }}
328322
install: |
329323
apt-get update
330-
apt-get install -y --no-install-recommends python3 python3-pip python3-venv libatomic1
331-
run: |
332-
python3 -m venv .venv
333-
source .venv/bin/activate
324+
apt-get install -y --no-install-recommends python3 python3-pip libatomic1
334325
pip3 install -U pip
326+
run: |
335327
pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
336328
ruff --help
337329
- name: "Upload wheels"

.github/workflows/publish-pypi.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,5 @@ jobs:
2828
pattern: wheels-*
2929
path: wheels
3030
merge-multiple: true
31-
- name: Remove wheels unsupported by PyPI
32-
run: rm wheels/*loong*
3331
- name: Publish to PyPi
3432
run: uv publish -v wheels/*

crates/ruff/Cargo.toml

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

88-
[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", target_arch = "riscv64", target_arch = "loongarch64")))'.dependencies]
88+
[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", target_arch = "riscv64")))'.dependencies]
8989
tikv-jemallocator = { workspace = true }
9090

9191
[lints]

crates/ruff/src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
2020
target_arch = "x86_64",
2121
target_arch = "aarch64",
2222
target_arch = "powerpc64",
23-
target_arch = "riscv64",
24-
target_arch = "loongarch64",
23+
target_arch = "riscv64"
2524
)
2625
))]
2726
#[global_allocator]

crates/ruff_benchmark/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@ walltime = ["ruff_db/os", "ty_project", "divan"]
8686
[target.'cfg(target_os = "windows")'.dev-dependencies]
8787
mimalloc = { workspace = true }
8888

89-
[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64", target_arch = "loongarch64")))'.dev-dependencies]
89+
[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dev-dependencies]
9090
tikv-jemallocator = { workspace = true }

crates/ruff_benchmark/benches/formatter.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
2222
target_arch = "x86_64",
2323
target_arch = "aarch64",
2424
target_arch = "powerpc64",
25-
target_arch = "riscv64",
26-
target_arch = "loongarch64"
25+
target_arch = "riscv64"
2726
)
2827
))]
2928
#[global_allocator]

crates/ruff_benchmark/benches/lexer.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
1919
target_arch = "x86_64",
2020
target_arch = "aarch64",
2121
target_arch = "powerpc64",
22-
target_arch = "riscv64",
23-
target_arch = "loongarch64"
22+
target_arch = "riscv64"
2423
)
2524
))]
2625
#[global_allocator]

crates/ruff_benchmark/benches/linter.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
2727
target_arch = "x86_64",
2828
target_arch = "aarch64",
2929
target_arch = "powerpc64",
30-
target_arch = "riscv64",
31-
target_arch = "loongarch64"
30+
target_arch = "riscv64"
3231
)
3332
))]
3433
#[global_allocator]
@@ -45,8 +44,7 @@ static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
4544
target_arch = "x86_64",
4645
target_arch = "aarch64",
4746
target_arch = "powerpc64",
48-
target_arch = "riscv64",
49-
target_arch = "loongarch64"
47+
target_arch = "riscv64"
5048
)
5149
))]
5250
#[unsafe(export_name = "_rjem_malloc_conf")]

crates/ruff_benchmark/benches/parser.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
2121
target_arch = "x86_64",
2222
target_arch = "aarch64",
2323
target_arch = "powerpc64",
24-
target_arch = "riscv64",
25-
target_arch = "loongarch64"
24+
target_arch = "riscv64"
2625
)
2726
))]
2827
#[global_allocator]

dist-workspace.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ targets = [
3030
"powerpc64le-unknown-linux-gnu",
3131
"riscv64gc-unknown-linux-gnu",
3232
"s390x-unknown-linux-gnu",
33-
"loongarch64-unknown-linux-gnu",
3433
"x86_64-unknown-linux-gnu",
3534
"x86_64-unknown-linux-musl",
3635
"x86_64-pc-windows-msvc",

0 commit comments

Comments
 (0)