Skip to content

Commit

Permalink
Pin to rust 1.72 in CI (#1333)
Browse files Browse the repository at this point in the history
* Bump sysroot_linux-64 to 2.17 in CI

* Easier fix? Pin to rust 1.72 in CI for now

* Revert "Bump sysroot_linux-64 to 2.17 in CI"

This reverts commit c6ce8e9.

* Make sure 1.72 is used by default
  • Loading branch information
charlesbluca authored May 15, 2024
1 parent 7e02237 commit f34120b
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 5 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.72
default: true
- name: Cache Cargo
uses: actions/cache@v3
with:
Expand All @@ -63,6 +67,10 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.72
default: true
- name: Cache Cargo
uses: actions/cache@v3
with:
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/test-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ jobs:
channel-priority: strict
activate-environment: dask-sql
environment-file: ${{ env.CONDA_FILE }}
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.72
default: true
- name: Install x86_64-apple-darwin target
if: matrix.os == 'macos-latest'
run: rustup target add x86_64-apple-darwin
Expand Down Expand Up @@ -103,6 +107,10 @@ jobs:
use-mamba: true
python-version: "3.9"
channel-priority: strict
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.72
default: true
- name: Install dependencies and nothing else
run: |
pip install -e . -vv
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,10 @@ jobs:
activate-environment: dask-sql
environment-file: ${{ env.CONDA_FILE }}
run-post: ${{ matrix.os != 'windows-latest' && 'true' || 'false' }}
- name: Cache Rust
uses: Swatinem/rust-cache@v2
- uses: actions-rs/toolchain@v1
with:
workspaces: dask_planner
shared-key: test
toolchain: 1.72
default: true
- name: Install x86_64-apple-darwin target
if: matrix.os == 'macos-latest'
run: rustup target add x86_64-apple-darwin
Expand Down Expand Up @@ -128,6 +127,10 @@ jobs:
use-mamba: true
python-version: "3.9"
channel-priority: strict
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.72
default: true
- name: Install dependencies and nothing else
run: |
pip install -e . -vv
Expand Down
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ dependencies:
- pygments>=2.7.1
- tabulate
- ucx-proc=*=cpu
- rust>=1.72
- rust=1.72

0 comments on commit f34120b

Please sign in to comment.