Skip to content

Commit 3bebc9e

Browse files
committed
TEST
1 parent a43ce8b commit 3bebc9e

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runs:
3030
run: |
3131
mkdir -p $HOME/d/protoc
3232
cd $HOME/d/protoc
33-
export PROTO_ZIP="protoc-21.4-osx-x86_64.zip"
33+
export PROTO_ZIP="protoc-21.4-osx-x86_64.zip"
3434
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v21.4/$PROTO_ZIP
3535
unzip $PROTO_ZIP
3636
echo "$HOME/d/protoc/bin" >> $GITHUB_PATH
@@ -39,9 +39,9 @@ runs:
3939
- name: Setup Rust toolchain
4040
shell: bash
4141
run: |
42-
rustup update stable
43-
rustup toolchain install stable
44-
rustup default stable
45-
rustup component add rustfmt
42+
rustup update 1.76
43+
rustup toolchain install 1.76
44+
rustup default 1.76
45+
rustup component add rustfmt --toolchain 1.76
4646
- name: Configure rust runtime env
47-
uses: ./.github/actions/setup-rust-runtime
47+
uses: ./.github/actions/setup-rust-runtime

.github/workflows/rust.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ jobs:
136136
needs: [ linux-build-lib ]
137137
runs-on: ubuntu-latest
138138
container:
139-
image: amd64/rust
139+
image: amd64/rust:1.76
140140
steps:
141141
- uses: actions/checkout@v4
142142
with:
143143
submodules: true
144144
- name: Setup Rust toolchain
145145
uses: ./.github/actions/setup-builder
146146
with:
147-
rust-version: stable
147+
rust-version: stable
148148
- name: Run tests (excluding doctests)
149149
run: cargo test --lib --tests --bins --features avro,json,backtrace
150150
- name: Verify Working Directory Clean
@@ -338,15 +338,15 @@ jobs:
338338
steps:
339339
- uses: actions/checkout@v4
340340
with:
341-
submodules: true
341+
submodules: true
342342
- name: Setup Rust toolchain
343-
uses: ./.github/actions/setup-macos-builder
343+
uses: ./.github/actions/setup-macos-builder
344344
- name: Run tests (excluding doctests)
345345
shell: bash
346346
run: |
347347
cargo test --lib --tests --bins --features avro,json,backtrace
348348
cd datafusion-cli
349-
cargo test --lib --tests --bins --all-features
349+
cargo test --lib --tests --bins --all-features
350350
351351
macos-aarch64:
352352
name: cargo test (macos-aarch64)
@@ -567,19 +567,19 @@ jobs:
567567
# (Min Supported Rust Version) than the one specified in the
568568
# `rust-version` key of `Cargo.toml`.
569569
#
570-
# To reproduce:
571-
# 1. Install the version of Rust that is failing. Example:
570+
# To reproduce:
571+
# 1. Install the version of Rust that is failing. Example:
572572
# rustup install 1.76.0
573573
# 2. Run the command that failed with that version. Example:
574574
# cargo +1.76.0 check -p datafusion
575-
#
575+
#
576576
# To resolve, either:
577-
# 1. Change your code to use older Rust features,
577+
# 1. Change your code to use older Rust features,
578578
# 2. Revert dependency update
579579
# 3. Update the MSRV version in `Cargo.toml`
580580
#
581581
# Please see the DataFusion Rust Version Compatibility Policy before
582-
# updating Cargo.toml. You may have to update the code instead.
582+
# updating Cargo.toml. You may have to update the code instead.
583583
# https://github.com/apache/datafusion/blob/main/README.md#rust-version-compatibility-policy
584584
cargo msrv --output-format json --log-target stdout verify
585585
- name: Check datafusion-substrait

datafusion/physical-plan/src/aggregates/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1939,6 +1939,7 @@ mod tests {
19391939
.build()?,
19401940
];
19411941

1942+
19421943
let blocking_exec = Arc::new(BlockingExec::new(Arc::clone(&schema), 1));
19431944
let refs = blocking_exec.refs();
19441945
let aggregate_exec = Arc::new(AggregateExec::try_new(

0 commit comments

Comments
 (0)