Skip to content

Commit e2d6cf0

Browse files
authored
Merge branch 'apache:main' into make-arrow-array-stream-reader-handle-metadata
2 parents b909742 + c9fca0b commit e2d6cf0

File tree

750 files changed

+152538
-44478
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

750 files changed

+152538
-44478
lines changed

.asf.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,39 @@
1616
# under the License.
1717

1818
# Documentation can be found here:
19-
# https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=127405038
19+
# https://github.com/apache/infrastructure-asfyaml/blob/main/README.md
2020

2121
notifications:
2222
commits: commits@arrow.apache.org
2323
issues: github@arrow.apache.org
2424
pullrequests: github@arrow.apache.org
25+
discussions: github@arrow.apache.org
2526
jira_options: link label worklog
2627
github:
2728
description: "Official Rust implementation of Apache Arrow"
2829
homepage: https://arrow.apache.org/
2930
labels:
3031
- arrow
3132
- parquet
32-
- object-store
3333
- rust
3434
enabled_merge_buttons:
3535
squash: true
36+
squash_commit_message: PR_TITLE_AND_DESC
3637
merge: false
3738
rebase: false
3839
features:
3940
issues: true
41+
discussions: true
4042
protected_branches:
41-
master:
43+
main:
4244
required_status_checks:
4345
# require branches to be up-to-date before merging
4446
strict: true
4547
# don't require any jobs to pass
4648
contexts: []
49+
pull_requests:
50+
# enable updating head branches of pull requests
51+
allow_update_branch: true
4752

4853
# publishes the content of the `asf-site` branch to
4954
# https://arrow.apache.org/rust/

.github/actions/setup-builder/action.yaml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,7 @@
1616
# under the License.
1717

1818
name: Prepare Rust Builder
19-
description: 'Prepare Rust Build Environment'
20-
inputs:
21-
rust-version:
22-
description: 'version of rust to install (e.g. stable)'
23-
required: false
24-
default: 'stable'
25-
target:
26-
description: 'target architecture(s)'
27-
required: false
28-
default: 'x86_64-unknown-linux-gnu'
19+
description: "Prepare Rust Build Environment"
2920
runs:
3021
using: "composite"
3122
steps:
@@ -43,6 +34,9 @@ runs:
4334
/usr/local/cargo/git/db/
4435
key: cargo-cache3-${{ hashFiles('**/Cargo.toml') }}
4536
restore-keys: cargo-cache3-
37+
- name: Setup Rust toolchain
38+
shell: bash
39+
run: rustup install
4640
- name: Generate lockfile
4741
shell: bash
4842
run: cargo fetch
@@ -51,12 +45,6 @@ runs:
5145
run: |
5246
apt-get update
5347
apt-get install -y protobuf-compiler
54-
- name: Setup Rust toolchain
55-
shell: bash
56-
run: |
57-
echo "Installing ${{ inputs.rust-version }}"
58-
rustup toolchain install ${{ inputs.rust-version }} --target ${{ inputs.target }}
59-
rustup default ${{ inputs.rust-version }}
6048
- name: Disable debuginfo generation
6149
# Disable full debug symbol generation to speed up CI build and keep memory down
6250
# "1" means line tables only, which is useful for panic tracebacks.
@@ -65,6 +53,9 @@ runs:
6553
- name: Enable backtraces
6654
shell: bash
6755
run: echo "RUST_BACKTRACE=1" >> $GITHUB_ENV
56+
- name: Disable incremental compilation
57+
shell: bash
58+
run: echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV
6859
- name: Fixup git permissions
6960
# https://github.com/actions/checkout/issues/766
7061
shell: bash

.github/dependabot.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
version: 2
22
updates:
33
- package-ecosystem: cargo
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
open-pull-requests-limit: 10
8-
target-branch: master
9-
labels: [ auto-dependencies, arrow ]
10-
- package-ecosystem: cargo
11-
directory: "/object_store"
4+
directories:
5+
- "/"
6+
- "/arrow-pyarrow-integration-testing"
127
schedule:
138
interval: daily
149
open-pull-requests-limit: 10
15-
target-branch: master
16-
labels: [ auto-dependencies, object_store ]
10+
target-branch: main
11+
labels: [auto-dependencies, arrow]
12+
groups:
13+
prost:
14+
applies-to: version-updates
15+
patterns:
16+
- "prost*"
17+
tonic:
18+
applies-to: version-updates
19+
patterns:
20+
- "tonic*"
1721
- package-ecosystem: "github-actions"
1822
directory: "/"
1923
schedule:
2024
interval: "daily"
2125
open-pull-requests-limit: 10
22-
labels: [ auto-dependencies ]
26+
labels: [auto-dependencies]

.github/pull_request_template.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,28 @@
11
# Which issue does this PR close?
22

3-
<!--
4-
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
5-
-->
3+
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax.
64

7-
Closes #.
5+
- Closes #NNN.
86

97
# Rationale for this change
10-
11-
<!--
8+
129
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
1310
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
14-
-->
1511

1612
# What changes are included in this PR?
1713

18-
<!--
1914
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
20-
-->
2115

22-
# Are there any user-facing changes?
16+
# Are these changes tested?
17+
18+
We typically require tests for all PRs in order to:
19+
1. Prevent the code from being accidentally broken by subsequent changes
20+
2. Serve as another way to document the expected behavior of the code
2321

22+
If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
23+
24+
# Are there any user-facing changes?
2425

25-
<!--
2626
If there are user-facing changes then we may require documentation to be updated before approving the PR.
27-
-->
2827

29-
<!---
3028
If there are any breaking changes to public APIs, please call them out.
31-
-->

.github/workflows/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
The CI is structured so most tests are run in specific workflows:
2121
`arrow.yml` for `arrow`, `parquet.yml` for `parquet` and so on.
2222

23-
The basic idea is to run all tests on pushes to master (to ensure we
24-
keep master green) but run only the individual workflows on PRs that
23+
The basic idea is to run all tests on pushes to main (to ensure we
24+
keep main green) but run only the individual workflows on PRs that
2525
change files that could affect them.

0 commit comments

Comments
 (0)