Skip to content

Commit 5cf42f6

Browse files
authored
Merge branch 'main' into ctty/storage-trait
2 parents a9d8fdf + 5724fc5 commit 5cf42f6

File tree

21 files changed

+776
-172
lines changed

21 files changed

+776
-172
lines changed

.asf.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ github:
4343
dismiss_stale_reviews: false
4444

4545
required_linear_history: true
46-
del_branch_on_merge: true
46+
pull_requests:
47+
# auto-delete head branches after being merged
48+
del_branch_on_merge: true
4749
features:
4850
wiki: false
4951
issues: true

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
security_audit:
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v5
43+
- uses: actions/checkout@v6
4444
- name: Setup Rust toolchain
4545
uses: ./.github/actions/setup-builder
4646
with:

.github/workflows/bindings_python_ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
check-rust:
4545
runs-on: ubuntu-latest
4646
steps:
47-
- uses: actions/checkout@v5
47+
- uses: actions/checkout@v6
4848
- name: Check format
4949
working-directory: "bindings/python"
5050
run: cargo fmt --all -- --check
@@ -55,7 +55,7 @@ jobs:
5555
check-python:
5656
runs-on: ubuntu-latest
5757
steps:
58-
- uses: actions/checkout@v5
58+
- uses: actions/checkout@v6
5959
- uses: astral-sh/setup-uv@v7
6060
with:
6161
version: "0.9.3"
@@ -81,7 +81,7 @@ jobs:
8181
- macos-latest
8282
- windows-latest
8383
steps:
84-
- uses: actions/checkout@v5
84+
- uses: actions/checkout@v6
8585
- uses: actions/setup-python@v6
8686
with:
8787
python-version: 3.12

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- ubuntu-latest
5353
- macos-latest
5454
steps:
55-
- uses: actions/checkout@v5
55+
- uses: actions/checkout@v6
5656

5757
- name: Setup Rust toolchain
5858
uses: ./.github/actions/setup-builder
@@ -101,7 +101,7 @@ jobs:
101101
root-reserve-mb: 10240
102102
temp-reserve-mb: 10240
103103

104-
- uses: actions/checkout@v5
104+
- uses: actions/checkout@v6
105105

106106
- name: Setup Rust toolchain
107107
uses: ./.github/actions/setup-builder
@@ -126,7 +126,7 @@ jobs:
126126
- macos-latest
127127
- windows-latest
128128
steps:
129-
- uses: actions/checkout@v5
129+
- uses: actions/checkout@v6
130130

131131
- name: Setup Rust toolchain
132132
uses: ./.github/actions/setup-builder
@@ -158,7 +158,7 @@ jobs:
158158
root-reserve-mb: 10240
159159
temp-reserve-mb: 10240
160160

161-
- uses: actions/checkout@v5
161+
- uses: actions/checkout@v6
162162

163163
- name: Setup Rust toolchain
164164
uses: ./.github/actions/setup-builder
@@ -180,7 +180,7 @@ jobs:
180180
name: Verify MSRV
181181
runs-on: ubuntu-latest
182182
steps:
183-
- uses: actions/checkout@v5
183+
- uses: actions/checkout@v6
184184
- name: Install protoc
185185
uses: arduino/setup-protoc@v3
186186
with:

.github/workflows/ci_typos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ jobs:
4040
env:
4141
FORCE_COLOR: 1
4242
steps:
43-
- uses: actions/checkout@v5
43+
- uses: actions/checkout@v6
4444
- name: Check typos
45-
uses: crate-ci/typos@v1.39.2
45+
uses: crate-ci/typos@v1.40.0

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- "crates/catalog/sql"
4646
- "crates/integrations/datafusion"
4747
steps:
48-
- uses: actions/checkout@v5
48+
- uses: actions/checkout@v6
4949

5050
- name: Setup Rust toolchain
5151
uses: ./.github/actions/setup-builder

.github/workflows/release_python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
runs-on: ubuntu-latest
8686
needs: [validate-release-tag]
8787
steps:
88-
- uses: actions/checkout@v5
88+
- uses: actions/checkout@v6
8989

9090
- name: Install toml-cli
9191
if: ${{ needs.validate-release-tag.outputs.is-rc == 'true' }}
@@ -128,7 +128,7 @@ jobs:
128128
}
129129
- { os: ubuntu-latest, target: "armv7l" }
130130
steps:
131-
- uses: actions/checkout@v5
131+
- uses: actions/checkout@v6
132132

133133
- name: Install toml-cli
134134
if: ${{ needs.validate-release-tag.outputs.is-rc == 'true' }}

.github/workflows/release_python_nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: github.repository == 'apache/iceberg-rust' # Only run for apache repo
4444
runs-on: ubuntu-latest
4545
steps:
46-
- uses: actions/checkout@v5
46+
- uses: actions/checkout@v6
4747

4848
- uses: ./.github/actions/overwrite-package-version # Overwrite package version with timestamp
4949
with:
@@ -78,7 +78,7 @@ jobs:
7878
}
7979
- { os: ubuntu-latest, target: "armv7l" }
8080
steps:
81-
- uses: actions/checkout@v5
81+
- uses: actions/checkout@v6
8282

8383
- uses: ./.github/actions/overwrite-package-version # Overwrite package version with timestamp
8484
with:

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
permissions:
3737
contents: write
3838
steps:
39-
- uses: actions/checkout@v5
39+
- uses: actions/checkout@v6
4040

4141
- name: Setup mdBook
4242
uses: peaceiris/actions-mdbook@v2

0 commit comments

Comments
 (0)