Skip to content

Commit 7428bc2

Browse files
authored
Merge pull request #42 from RelationalAI/gb/merge-upstream-20260209
Merge upstream 20260209
2 parents 769adbb + 878d4dd commit 7428bc2

105 files changed

Lines changed: 6082 additions & 3541 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.

.cargo/audit.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,4 @@ ignore = [
3333
#
3434
# Introduced by object_store, see https://github.com/apache/arrow-rs-object-store/issues/564
3535
"RUSTSEC-2025-0134",
36-
37-
# Tracked here: https://github.com/paupino/rust-decimal/issues/766
38-
"RUSTSEC-2026-0001",
3936
]

.github/workflows/ci.yml

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,6 @@ jobs:
8686
- macos-latest
8787
- windows-latest
8888
steps:
89-
- name: Maximize build space (Ubuntu)
90-
if: matrix.os == 'ubuntu-latest'
91-
uses: easimon/maximize-build-space@master
92-
with:
93-
remove-dotnet: "true"
94-
remove-android: "true"
95-
remove-haskell: "true"
96-
remove-codeql: "true"
97-
remove-docker-images: "true"
98-
root-reserve-mb: 10240
99-
temp-reserve-mb: 10240
100-
10189
- uses: actions/checkout@v6
10290

10391
- name: Setup Rust toolchain
@@ -134,26 +122,15 @@ jobs:
134122
- name: Build
135123
run: cargo build -p iceberg --no-default-features
136124

137-
unit:
125+
tests:
138126
runs-on: ubuntu-latest
139127
strategy:
140128
matrix:
141129
test-suite:
142130
- { name: "default", args: "--all-targets --all-features --workspace" }
143131
- { name: "doc", args: "--doc --all-features --workspace" }
144-
name: Unit Tests (${{ matrix.test-suite.name }})
132+
name: Tests (${{ matrix.test-suite.name }})
145133
steps:
146-
- name: Maximize build space
147-
uses: easimon/maximize-build-space@master
148-
with:
149-
remove-dotnet: "true"
150-
remove-android: "true"
151-
remove-haskell: "true"
152-
remove-codeql: "true"
153-
remove-docker-images: "true"
154-
root-reserve-mb: 10240
155-
temp-reserve-mb: 10240
156-
157134
- uses: actions/checkout@v6
158135

159136
- name: Setup Rust toolchain
@@ -169,8 +146,30 @@ jobs:
169146
with:
170147
key: ${{ matrix.test-suite.name }}
171148

172-
- name: Test
173-
run: cargo test --no-fail-fast ${{ matrix.test-suite.args }}
149+
- name: Install cargo-nextest
150+
if: matrix.test-suite.name == 'default'
151+
uses: taiki-e/install-action@v2
152+
with:
153+
tool: cargo-nextest
154+
155+
- name: Start Docker containers
156+
if: matrix.test-suite.name == 'default'
157+
run: make docker-up
158+
159+
- name: Run tests
160+
env:
161+
# Disable debug info to speed up compilation and reduce artifact size
162+
RUSTFLAGS: "-C debuginfo=0"
163+
run: |
164+
if [ "${{ matrix.test-suite.name }}" = "default" ]; then
165+
cargo nextest run ${{ matrix.test-suite.args }}
166+
else
167+
cargo test --no-fail-fast ${{ matrix.test-suite.args }}
168+
fi
169+
170+
- name: Stop Docker containers
171+
if: always() && matrix.test-suite.name == 'default'
172+
run: make docker-down
174173

175174
msrv:
176175
name: Verify MSRV

.github/workflows/ci_typos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@v6
4444
- name: Check typos
45-
uses: crate-ci/typos@v1.42.0
45+
uses: crate-ci/typos@v1.43.3

CONTRIBUTING.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,7 @@ cargo 1.69.0 (6e9a83356 2023-04-12)
101101

102102
#### Install Docker or Podman
103103

104-
Currently, iceberg-rust uses Docker to set up environment for integration tests. Native Docker has some limitations, please check (https://github.com/apache/iceberg-rust/pull/748). Please use Orbstack or Podman.
105-
106-
For MacOS users, you can install [OrbStack as a docker alternative](website/src/reference/orbstack.md).
107-
For Podman users, refer to [Using Podman instead of Docker](website/src/reference/podman.md)
104+
Currently, iceberg-rust uses Docker to set up environment for integration tests. See [Container Runtimes](website/src/reference/container-runtimes.md) for setup instructions.
108105

109106
## Build
110107

0 commit comments

Comments
 (0)