This is an automated email from the ASF dual-hosted git repository.
xudong963 pushed a commit to branch branch-46
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/branch-46 by this push:
new d5ca830794 Fix verification script and extended tests due to `rustup`
changes (#14990)
d5ca830794 is described below
commit d5ca8307940c1a6345419a2c8d91ef87704659be
Author: Andrew Lamb <[email protected]>
AuthorDate: Tue Mar 4 01:54:44 2025 -0500
Fix verification script and extended tests due to `rustup` changes (#14990)
* Fix rustup toolchain errors
* Use standard builder setup in extended tests
* fix yaml
* sprinkle sudo
* Revert "sprinkle sudo"
This reverts commit 0ed0e0ab5ad7f904cb6fb93c57fd063e5911ffc6.
* no contianer
* use rust container
* fix extended jobs
* fix
* Update .github/workflows/extended.yml
---
.github/workflows/extended.yml | 6 ++++--
dev/release/verify-release-candidate.sh | 5 ++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/extended.yml b/.github/workflows/extended.yml
index 3f882d7a3a..1ad1c36e1a 100644
--- a/.github/workflows/extended.yml
+++ b/.github/workflows/extended.yml
@@ -36,6 +36,7 @@ jobs:
linux-build-lib:
name: linux build test
runs-on: ubuntu-latest
+ # note: do not use amd/rust container to preserve disk space
steps:
- uses: actions/checkout@v4
with:
@@ -45,7 +46,7 @@ jobs:
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s --
-y
source $HOME/.cargo/env
- rustup default stable
+ rustup toolchain install
- name: Install Protobuf Compiler
run: sudo apt-get install -y protobuf-compiler
- name: Prepare cargo build
@@ -58,6 +59,7 @@ jobs:
name: cargo test 'extended_tests' (amd64)
needs: linux-build-lib
runs-on: ubuntu-latest
+ # note: do not use amd/rust container to preserve disk space
steps:
- uses: actions/checkout@v4
with:
@@ -69,7 +71,7 @@ jobs:
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s --
-y
source $HOME/.cargo/env
- rustup default stable
+ rustup toolchain install
- name: Install Protobuf Compiler
run: sudo apt-get install -y protobuf-compiler
# For debugging, test binaries can be large.
diff --git a/dev/release/verify-release-candidate.sh
b/dev/release/verify-release-candidate.sh
index 2c0bd216b3..a053569dcb 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -117,8 +117,11 @@ test_source_distribution() {
# build and test rust
+ # install the needed version of rust defined in rust-toolchain.toml
+ rustup toolchain install
+
# raises on any formatting errors
- rustup component add rustfmt --toolchain stable
+ rustup component add rustfmt
cargo fmt --all -- --check
# Clone testing repositories into the expected location
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
