Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always install correct version of rust in CI #14992

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

alamb
Copy link
Contributor

@alamb alamb commented Mar 3, 2025

TODO remove the unused parameter to setup builder sript

Which issue does this PR close?

Rationale for this change

We now use the rust-toolchain.toml file to specify what version of rust to use

However, the recently released rustup version no longer automatically installs this toolchain

https://github.com/rust-lang/rustup/blob/f00c3d1fbcbe8d3ae2411e63ca906bc9b69e43d1/CHANGELOG.md?plain=1#L9-L17

Thus to ensure we have the correct toolchain installed, we need to run rustup toolchain install

What changes are included in this PR?

  1. Call rustup toolchain install as part of the builder setup
  2. Let's move this change into the builder setup job and reduce some re

Are these changes tested?

By CI

Are there any user-facing changes?

@github-actions github-actions bot added the development-process Related to development process of DataFusion label Mar 3, 2025
@@ -17,14 +17,13 @@

name: Prepare Rust Builder
description: 'Prepare Rust Build Environment'
inputs:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was only ever called with stable so the parameter is unecessary

"${RETRY[@]}" rustup default ${{ inputs.rust-version }}
echo "Installing Rust ..."
# install toolchain specified by rust-toolchain.toml
"${RETRY[@]}" rustup toolchain install
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now this installs the version of rust specified by rust-toolchain.toml

runs:
using: "composite"
steps:
- uses: actions/checkout@v4
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to checkout the code in the builder setup to get the rust-toolchain.toml file

@alamb alamb changed the title Setup correct version of rust in CI Always install correct version of rust in CI Mar 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
development-process Related to development process of DataFusion
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant