Skip to content

Commit c83ec8a

Browse files
authored
Revert "chore[ci]: add windows test to CI (#5439)" (#5449)
This reverts commit 63b759f. Signed-off-by: Alexander Droste <[email protected]>
1 parent 95972bc commit c83ec8a

File tree

3 files changed

+2
-60
lines changed

3 files changed

+2
-60
lines changed

.github/actions/setup-rust/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ runs:
2525
run: echo "version=$(cat rust-toolchain.toml | grep channel | awk -F'\"' '{print $2}')" >> $GITHUB_OUTPUT
2626

2727
- name: Install Mold
28-
if: runner.os == 'Linux'
2928
uses: rui314/setup-mold@v1
3029

3130
- name: Rust Toolchain
@@ -51,7 +50,6 @@ runs:
5150
run: echo "PATH=$PATH" >> $GITHUB_ENV
5251

5352
- name: Install Protoc (for lance-encoding build step)
54-
if: runner.os != 'Windows'
5553
uses: arduino/setup-protoc@v3
5654
with:
5755
version: "29.3"

.github/workflows/ci.yml

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -400,59 +400,6 @@ jobs:
400400
--target x86_64-unknown-linux-gnu \
401401
--verbose
402402
403-
rust-test-other:
404-
name: "Rust tests (${{ matrix.os }})"
405-
timeout-minutes: 120
406-
strategy:
407-
fail-fast: false
408-
matrix:
409-
include:
410-
- os: windows-x64
411-
runner:
412-
- runs-on=${{ github.run_id }}
413-
- family=m7i
414-
- cpu=8
415-
- image=windows22-full-x64
416-
- tag=rust-test-windows
417-
- os: linux-arm64
418-
runner:
419-
- runs-on=${{ github.run_id }}
420-
- family=m7g
421-
- cpu=8
422-
- image=ubuntu24-full-arm64
423-
- extras=s3-cache
424-
- tag=rust-test-linux-arm64
425-
runs-on: ${{ matrix.runner }}
426-
steps:
427-
- uses: runs-on/action@v2
428-
if: matrix.os == 'linux-arm64'
429-
with:
430-
sccache: s3
431-
- uses: actions/checkout@v5
432-
- name: Install Visual Studio Build Tools (Windows)
433-
if: matrix.os == 'windows-x64'
434-
shell: bash
435-
run: |
436-
choco install visualstudio2022buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --passive" -y
437-
- name: Setup Python (Windows)
438-
if: matrix.os == 'windows-x64'
439-
uses: actions/setup-python@v5
440-
with:
441-
python-version: "3.11"
442-
- uses: ./.github/actions/setup-rust
443-
with:
444-
repo-token: ${{ secrets.GITHUB_TOKEN }}
445-
- name: Install nextest
446-
uses: taiki-e/install-action@v2
447-
with:
448-
tool: nextest
449-
- name: Rust Tests (Windows)
450-
if: matrix.os == 'windows-x64'
451-
run: cargo nextest run --locked --workspace --all-features --no-fail-fast --exclude bench-vortex --exclude vortex-python --exclude vortex-duckdb
452-
- name: Rust Tests (Other)
453-
if: matrix.os != 'windows-x64'
454-
run: cargo nextest run --locked --workspace --all-features --no-fail-fast --exclude bench-vortex
455-
456403
build-java:
457404
name: "Java"
458405
runs-on: ubuntu-latest

vortex-io/src/file/object_store.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// SPDX-FileCopyrightText: Copyright the Vortex contributors
33

44
use std::io;
5-
#[cfg(not(unix))]
6-
use std::io::{Read, Seek};
75
#[cfg(unix)]
86
use std::os::unix::fs::FileExt;
97
use std::sync::Arc;
@@ -127,9 +125,8 @@ impl ReadSource for ObjectStoreIoSource {
127125
)
128126
.await?;
129127

130-
#[cfg_attr(unix, allow(unused_mut))]
131128
let buffer = match response.payload {
132-
object_store::GetResultPayload::File(mut file, _) => {
129+
object_store::GetResultPayload::File(file, _) => {
133130
// SAFETY: We're setting the length to the exact size we're about to read.
134131
// The read_exact_at call will either fill the entire buffer or return an error,
135132
// ensuring no uninitialized memory is exposed.
@@ -142,7 +139,7 @@ impl ReadSource for ObjectStoreIoSource {
142139
Ok::<_, io::Error>(buffer)
143140
}
144141
#[cfg(not(unix))] {
145-
file.seek(io::SeekFrom::Start(range.start))?;
142+
file.seek(range.start)?;
146143
file.read_exact(&mut buffer)?;
147144
Ok::<_, io::Error>(buffer)
148145
}

0 commit comments

Comments
 (0)